diff --git a/tools/external_ic.F90 b/tools/external_ic.F90
index 066ac630e..7ab4d2087 100644
--- a/tools/external_ic.F90
+++ b/tools/external_ic.F90
@@ -463,7 +463,7 @@ subroutine get_nggps_ic (Atm, fv_domain, dt_atmos )
 !> Namelist variables 
 !>       filtered_terrain  -  use orography maker filtered terrain mapping
 #ifdef __PGI
-      use GFS_restart, only : GFS_restart_type
+!!      use GFS_restart, only : GFS_restart_type
 
       implicit none
 #endif
@@ -1390,7 +1390,7 @@ end subroutine get_ncep_ic
   subroutine get_ecmwf_ic( Atm, fv_domain )
 
 #ifdef __PGI
-      use GFS_restart, only : GFS_restart_type
+!!      use GFS_restart, only : GFS_restart_type
 
       implicit none
 #endif
diff --git a/tools/fv_diagnostics.F90 b/tools/fv_diagnostics.F90
index 22b38cbb8..b4c811762 100644
--- a/tools/fv_diagnostics.F90
+++ b/tools/fv_diagnostics.F90
@@ -3695,7 +3695,7 @@ subroutine range_check_3d(qname, q, is, ie, js, je, n_g, km, pos, q_low, q_hi, b
           if (present(Time)) then
              call get_date(Time, year, month, day, hour, minute, second)
              if (master) write(*,999) year, month, day, hour, minute, second
-999          format(' Range violation on: ', I4, '/', I02, '/', I02, ' ', I02, ':', I02, ':', I02)
+999          format(' Range violation on: ', I4, '/', I2, '/', I2, ' ', I2, ':', I2, ':', I2)
           endif
           if ( present(bad_range) ) then
                bad_range = .true. 
@@ -3760,7 +3760,7 @@ subroutine range_check_2d(qname, q, is, ie, js, je, n_g, pos, q_low, q_hi, bad_r
           if (present(Time)) then
              call get_date(Time, year, month, day, hour, minute, second)
              if (master) write(*,999) year, month, day, hour, minute, second
-999          format(' Range violation on: ', I4, '/', I02, '/', I02, ' ', I02, ':', I02, ':', I02)
+999          format(' Range violation on: ', I4, '/', I2, '/', I2, ' ', I2, ':', I2, ':', I2)
           endif
           if ( present(bad_range) ) then
                bad_range = .true.