diff --git a/physics/GWD/cires_tauamf_data.F90 b/physics/GWD/cires_tauamf_data.F90
index 364c79409..009d94d5d 100644
--- a/physics/GWD/cires_tauamf_data.F90
+++ b/physics/GWD/cires_tauamf_data.F90
@@ -171,7 +171,7 @@ end subroutine tau_amf_interp
     
 !>
     subroutine gfs_idate_calendar(idate, fhour, ddd, fddd) 
-    
+
     use machine, only: kind_phys    		 
     implicit none  
 ! input     
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta
index af9afcdfe..6eb4d9c3a 100644
--- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta
+++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta
@@ -73,14 +73,14 @@
 [nsswr]
   standard_name = number_of_timesteps_between_shortwave_radiation_calls
   long_name = number of timesteps between shortwave radiation calls
-  units = 
+  units =
   dimensions = ()
   type = integer
   intent = in
 [nslwr]
   standard_name = number_of_timesteps_between_longwave_radiation_calls
   long_name = number of timesteps between longwave radiation calls
-  units = 
+  units =
   dimensions = ()
   type = integer
   intent = in
@@ -176,7 +176,7 @@
 [ipt]
   standard_name = index_of_horizontal_gridpoint_for_debug_output
   long_name = horizontal index for point used for diagnostic printout
-  units = index 
+  units = index
   dimensions = ()
   type = integer
   intent = out
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90
index 797a1cd95..43d71a2d9 100644
--- a/physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90
+++ b/physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90
@@ -72,6 +72,7 @@ subroutine scm_sfc_flux_spec_run (im, u1, v1, z1, t1, q1, p1, roughness_length,
     integer,          intent(out) :: errflg
 
     integer :: i
+    integer, parameter :: lake_model_on = 1, lake_model_off = 0 ! to match type of use_lake_model
 
     real(kind=kind_phys) :: rho, q1_non_neg, w_thv1, rho_cp_inverse, rho_hvap_inverse, Obukhov_length, thv1, tvs, &
       dtv, adtv, wind10m, u_fraction, roughness_length_m
@@ -211,12 +212,12 @@ subroutine scm_sfc_flux_spec_run (im, u1, v1, z1, t1, q1, p1, roughness_length,
   do i = 1, im
     if ((wet(i) .or. icy(i)) .and. lakefrac(i) > 0.0_kind_phys) then
       if (lkm == 1 .and. lakefrac(i) >= 0.15 .and. lakedepth(i) > 1.0_kind_phys) then
-        use_lake_model(i) = 1
+        use_lake_model(i) = lake_model_on
       else
-        use_lake_model(i) = 0
+        use_lake_model(i) = lake_model_off
       endif
     else
-      use_lake_model(i) = 0
+      use_lake_model(i) = lake_model_off
     endif
   enddo
 !
diff --git a/physics/MP/Morrison_Gettelman/aerinterp.F90 b/physics/MP/Morrison_Gettelman/aerinterp.F90
index 74ae4726c..34dd6b93d 100644
--- a/physics/MP/Morrison_Gettelman/aerinterp.F90
+++ b/physics/MP/Morrison_Gettelman/aerinterp.F90
@@ -6,7 +6,6 @@
 !! This module contain subroutines of reading and interpolating
 !! aerosol data for MG microphysics.
 module aerinterp
-
     implicit none
 
     private read_netfaer
diff --git a/physics/SFC_Models/Lake/CLM/clm_lake.f90 b/physics/SFC_Models/Lake/CLM/clm_lake.f90
index 6dd973c8d..052d54d8c 100644
--- a/physics/SFC_Models/Lake/CLM/clm_lake.f90
+++ b/physics/SFC_Models/Lake/CLM/clm_lake.f90
@@ -5626,7 +5626,7 @@ SUBROUTINE lakeini(kdt,            ISLTYP,          gt0,             snowd,
      ! initial t_soisno3d
      ! in snow
      if(snowdp2d(i) > 0.) then
-       do k = snl2d(i)+1, 0
+       do k = nint(snl2d(i))+1, 0
          t_soisno3d(i,k) =min(tfrz,tsfc(i))
        enddo
      endif
diff --git a/physics/SFC_Models/Land/Noahmp/module_sf_noahmp_glacier.F90 b/physics/SFC_Models/Land/Noahmp/module_sf_noahmp_glacier.F90
index bcb157c54..f2ade5384 100644
--- a/physics/SFC_Models/Land/Noahmp/module_sf_noahmp_glacier.F90
+++ b/physics/SFC_Models/Land/Noahmp/module_sf_noahmp_glacier.F90
@@ -1,4 +1,6 @@
+#ifndef CCPP
 #define CCPP
+#endif
 !>  \file module_sf_noahmp_glacier.F90
 !!  This file contains the NoahMP Glacier scheme.
 
diff --git a/physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90 b/physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90
index a76a354e6..92b499598 100644
--- a/physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90
+++ b/physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90
@@ -1,4 +1,6 @@
+#ifndef CCPP
 #define CCPP
+#endif
 !>  \file module_sf_noahmplsm.F90
 !!  This file contains the NoahMP land surface model.
 
diff --git a/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 b/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90
index 1313e9ff3..de5e12878 100644
--- a/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90
+++ b/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90
@@ -1,4 +1,6 @@
+#ifndef CCPP
 #define CCPP
+#endif
 !>  \file noahmpdrv.F90
 !!  This file contains the NoahMP land surface scheme driver.