diff --git a/SRC/HYDRO_CORE/hydro_core.c b/SRC/HYDRO_CORE/hydro_core.c
index 33084d3..ff1a951 100644
--- a/SRC/HYDRO_CORE/hydro_core.c
+++ b/SRC/HYDRO_CORE/hydro_core.c
@@ -527,7 +527,9 @@ int hydro_coreGetParams(){
      errorCode = queryFloatParameter("moistureCondTscale", &moistureCondTscale, 1e-4, 1000.0, PARAM_MANDATORY);
      errorCode = queryIntegerParameter("moistureCondBasePres", &moistureCondBasePres, 0, 1, PARAM_MANDATORY);
      errorCode = queryFloatParameter("moistureMPcallTscale", &moistureMPcallTscale, 1e-4, 1000.0, PARAM_MANDATORY);
-     errorCode = queryFloatParameter("surflayer_wq", &surflayer_wq, -5e+0, 5e+0, PARAM_MANDATORY);
+     if (surflayerSelector == 1){
+       errorCode = queryFloatParameter("surflayer_wq", &surflayer_wq, -5e+0, 5e+0, PARAM_MANDATORY);
+     }
      if (surflayerSelector == 2){
        errorCode = queryFloatParameter("surflayer_qr", &surflayer_qr, -1e+1, 1e+1, PARAM_MANDATORY);
        errorCode = queryIntegerParameter("surflayer_qskin_input", &surflayer_qskin_input, 0, 1, PARAM_OPTIONAL);
@@ -3429,12 +3431,12 @@ int hydro_coreAddFieldAttributes(char *fieldName, int isForcing) {
         {"ql",          "g kg-1",        "Cloud liquid water mixing ratio",                               "cloud_liquid_water_mixing_ratio"},
         {"fricVel",     "m s-1",         "Surface friction velocity",                                     "surface_friction_velocity"},
         {"htFlux",      "K m s-1",       "Surface sensible heat flux",                                    "surface_upward_sensible_heat_flux"},
-        {"qFlux",       "kg kg-1 m s-1", "Surface latent heat flux",                                      "surface_upward_latent_heat_flux"},
+        {"qFlux",       "g kg-1 m s-1",  "Surface latent heat flux",                                      "surface_upward_latent_heat_flux"},
         {"tskin",       "K",             "Surface skin temperature",                                      "surface_temperature"},
-        {"qskin",       "kg kg-1",       "Surface skin water vapor mixing ratio",                         NULL},
+        {"qskin",       "g kg-1",        "Surface skin water vapor mixing ratio",                         NULL},
         {"z0m",         "m",             "Roughness length for momentum",                                 "surface_roughness_length_for_momentum_in_air"},
         {"z0t",         "m",             "Roughness length for heat",                                     "surface_roughness_length_for_heat_in_air"},
-        {"invOblen",    "m-1",           "Inverse Obukhov length",                                        "atmosphere_boundary_layer_thickness"},
+        {"invOblen",    "m-1",           "Inverse Obukhov length",                                        NULL},
         {"CanopyLAD",   "m-1",           "Leaf area density",                                             "leaf_area_density"},
         {"SeaMask",     "-",             "Sea mask",                                                      "sea_area_fraction"},
         {NULL, NULL, NULL, NULL} // End marker                                                                                                           
diff --git a/scripts/python_utilities/post-processing/field_attributes.json b/scripts/python_utilities/post-processing/field_attributes.json
index 8fffaab..03fa39a 100644
--- a/scripts/python_utilities/post-processing/field_attributes.json
+++ b/scripts/python_utilities/post-processing/field_attributes.json
@@ -24,12 +24,12 @@
     "ql": ["g kg-1", "Cloud liquid water mixing ratio", "cloud_liquid_water_mixing_ratio"],
     "fricVel": ["m s-1", "Surface friction velocity", "surface_friction_velocity"],
     "htFlux": ["K m s-1", "Surface sensible heat flux", "surface_upward_sensible_heat_flux"],
-    "qFlux": ["kg kg-1 m s-1", "Surface latent heat flux", "surface_upward_latent_heat_flux"],
+    "qFlux": ["g kg-1 m s-1", "Surface latent heat flux", "surface_upward_latent_heat_flux"],
     "tskin": ["K", "Surface skin temperature", "surface_temperature"],
-    "qskin": ["kg kg-1", "Surface skin water vapor mixing ratio", null],
+    "qskin": ["g kg-1", "Surface skin water vapor mixing ratio", null],
     "z0m": ["m", "Roughness length for momentum", "surface_roughness_length_for_momentum_in_air"],
     "z0t": ["m", "Roughness length for heat", "surface_roughness_length_for_heat_in_air"],
-    "invOblen": ["m-1", "Inverse Obukhov length", "atmosphere_boundary_layer_thickness"],
+    "invOblen": ["m-1", "Inverse Obukhov length", null],
     "cellpert_amp": ["K", "Cell perturbation amplitude", null],
     "cellpert_nts": ["-", "Cell perturbation number of time steps", null],
     "cellpert_ktop": ["-", "Cell perturbation top grid level", null],