diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
index f9c6fd009..d1edf268d 100644
--- a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
+++ b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
@@ -156,8 +156,8 @@ int main(int argc, char **argv)
      * ThermoUnknowns
      */
     double T;
-    double H0_NaCl, H0_Naplus, H0_Clminus, Delta_H0s, H0_H2O;
-    double H_NaCl, H_Naplus, H_Clminus, H_H2O;
+    double H0_NaCl = 0.0, H0_Naplus = 0.0, H0_Clminus = 0.0, Delta_H0s, H0_H2O = 0.0;
+    double H_NaCl = 0.0, H_Naplus = 0.0, H_Clminus = 0.0, H_H2O = 0.0;
     double molarEnth0;
 
     printf("A_L/RT: Comparison to Pitzer's book, p. 99, can be made.\n");
diff --git a/test_problems/cathermo/HMW_graph_HvT/L_standalone.cpp b/test_problems/cathermo/HMW_graph_HvT/L_standalone.cpp
index 876e16c1c..f9fd7aacf 100644
--- a/test_problems/cathermo/HMW_graph_HvT/L_standalone.cpp
+++ b/test_problems/cathermo/HMW_graph_HvT/L_standalone.cpp
@@ -139,7 +139,7 @@ double calc(double temp, double Iionic) {
 
   double molecWeight = 18.01528;
 
-  double RT = GasConst * temp * 1.0E-3;
+  //double RT = GasConst * temp * 1.0E-3;
   //double IdealMixing = 2.0 * RT * m * (log(m) - 1.0);
   //printf("   IdealMixing = %20.13g kJ/kg_water\n", IdealMixing);
 
@@ -150,7 +150,7 @@ double calc(double temp, double Iionic) {
   return phiL;
 }
 
-main() {
+int main() {
 
   printf("Standalone test of the apparent relative molal enthalpy, phiL:\n");
   printf(" (Check against simple formula in Silvester&Pitzer, J. Phys. Chem. 81, 1822 (1977)\n");
@@ -164,5 +164,5 @@ main() {
   printf("Ionic Strength = %g\n", Iionic);
 
   res = calc(273.15 + 200., Iionic);
-
+  return 0;
 }
diff --git a/test_problems/cathermo/HMW_graph_HvT/Makefile.in b/test_problems/cathermo/HMW_graph_HvT/Makefile.in
index b088381a7..f4ae6afa2 100644
--- a/test_problems/cathermo/HMW_graph_HvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_HvT/Makefile.in
@@ -108,7 +108,7 @@ endif
 	@ ./runtest
 
 clean:
-	$(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends
+	$(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends *.o
 	../../../bin/rm_cvsignore
 	(if test -d SunWS_cache ; then \
            $(RM) -rf SunWS_cache ; \