diff --git a/Cantera/src/thermo/State.cpp b/Cantera/src/thermo/State.cpp
index 512be883a..5fcdbbfa8 100644
--- a/Cantera/src/thermo/State.cpp
+++ b/Cantera/src/thermo/State.cpp
@@ -28,6 +28,13 @@ using namespace std;
 
 namespace Cantera {
 
+  inline void State::stateMFChangeCalc(bool forcerChange) {
+    // Right now we assume that the mole fractions have changed every time
+    // the function is called
+    m_stateNum++;
+    if (m_stateNum > 1000000) m_stateNum = -10000000;
+  }
+
   State::State() : 
     m_kk(0),
     m_temp(0.0), 
@@ -236,13 +243,6 @@ namespace Cantera {
     m_dens = molarDensity*meanMolecularWeight();
   }
 
-  inline void State::stateMFChangeCalc(bool forcerChange) {
-    // Right now we assume that the mole fractions have changed every time
-    // the function is called
-    m_stateNum++;
-    if (m_stateNum > 1000000) m_stateNum = -10000000;
-  }
-
 
   void State::init(const array_fp& mw) {
     m_kk = mw.size();
diff --git a/Cantera/src/thermo/ThermoPhase.cpp b/Cantera/src/thermo/ThermoPhase.cpp
index 891afb291..1724694b3 100644
--- a/Cantera/src/thermo/ThermoPhase.cpp
+++ b/Cantera/src/thermo/ThermoPhase.cpp
@@ -750,7 +750,7 @@ namespace Cantera {
   doublereal ThermoPhase::err(std::string msg) const {
     throw CanteraError("ThermoPhase","Base class method "
 		       +msg+" called. Equation of state type: "+int2str(eosType()));
-    return 0;
+    return 0.0;
   }
 
   /*