diff --git a/components/eamxx/src/dynamics/homme/eamxx_homme_iop.cpp b/components/eamxx/src/dynamics/homme/eamxx_homme_iop.cpp
index eaf65a69cda5..fefd213971d6 100644
--- a/components/eamxx/src/dynamics/homme/eamxx_homme_iop.cpp
+++ b/components/eamxx/src/dynamics/homme/eamxx_homme_iop.cpp
@@ -277,7 +277,7 @@ apply_iop_forcing(const Real dt)
 
   ElementOps elem_ops;
   elem_ops.init(hvcoord);
-  const bool use_moisture = (params.moisture == Homme::MoistDry::MOIST);
+  const bool use_moisture = params.use_moisture;
 
   // Load data from IOP files, if necessary
   m_iop->read_iop_file_data(timestamp());
diff --git a/components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp b/components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp
index 5c71bf92244c..882261f021b8 100644
--- a/components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp
+++ b/components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp
@@ -819,7 +819,7 @@ void HommeDynamics::init_homme_views () {
   std::stringstream msg;
   msg << "\n************** HOMMEXX SimulationParams **********************\n\n";
   msg << "   time_step_type: " << Homme::etoi(params.time_step_type) << "\n";
-  msg << "   moisture: " << (params.moisture==Homme::MoistDry::DRY ? "dry" : "moist") << "\n";
+  msg << "   moisture: " << (params.use_moisture ? "moist" : "dry") << "\n";
   msg << "   remap_alg: " << Homme::etoi(params.remap_alg) << "\n";
   msg << "   test case: " << Homme::etoi(params.test_case) << "\n";
   msg << "   ftype: " << Homme::etoi(params.ftype) << "\n";
diff --git a/components/eamxx/src/dynamics/homme/interface/homme_driver_mod.F90 b/components/eamxx/src/dynamics/homme/interface/homme_driver_mod.F90
index eefcd65e8d7f..99773833c333 100644
--- a/components/eamxx/src/dynamics/homme/interface/homme_driver_mod.F90
+++ b/components/eamxx/src/dynamics/homme/interface/homme_driver_mod.F90
@@ -4,7 +4,7 @@
 #endif
 
 module homme_driver_mod
-  use iso_c_binding,     only: c_ptr, c_int, c_double, c_bool, C_NULL_CHAR
+  use iso_c_binding,     only: c_ptr, c_int, c_double, C_NULL_CHAR
 
   use parallel_mod,  only: abortmp
 
@@ -192,7 +192,7 @@ subroutine prim_init_model_f90 () bind(c)
                                  elem, hybrid, hvcoord, deriv, tl
 
     ! Local variable
-    logical(kind=c_bool), parameter :: allocate_buffer = .false.
+    logical, parameter :: allocate_buffer = .false.
 
     if (.not. is_data_structures_inited) then
       call abortmp ("Error! 'prim_init_data_structures_f90' has not been called yet.\n")