diff --git a/src/base/xml.cpp b/src/base/xml.cpp
index 935b8c898..c18da5733 100644
--- a/src/base/xml.cpp
+++ b/src/base/xml.cpp
@@ -1435,7 +1435,7 @@ XML_Node& XML_Node::child(const std::string& aloc) const
     string::size_type iloc;
     string cname;
     string loc = aloc;
-    std::map<std::string,XML_Node*>::const_iterator i;
+    std::multimap<std::string,XML_Node*>::const_iterator i;
 
     while (1) {
         iloc = loc.find('/');
diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp
index 41afb2b7e..03f8724ed 100644
--- a/src/numerics/NonlinearSolver.cpp
+++ b/src/numerics/NonlinearSolver.cpp
@@ -1259,7 +1259,7 @@ int NonlinearSolver::doAffineNewtonSolve(const doublereal* const y_curr,   const
          * Add junk to the Hessian diagonal
          *  -> Note, testing indicates that this will get too big for ill-conditioned systems.
          */
-        hcol = sqrt(neq_) * 1.0E-7 * hnorm;
+        hcol = sqrt(1.0*neq_) * 1.0E-7 * hnorm;
 #ifdef DEBUG_HKM_NOT
         if (hcol > 1.0) {
             hcol = 1.0E1;
diff --git a/src/thermo/GibbsExcessVPSSTP.cpp b/src/thermo/GibbsExcessVPSSTP.cpp
index 07188293a..695adae63 100644
--- a/src/thermo/GibbsExcessVPSSTP.cpp
+++ b/src/thermo/GibbsExcessVPSSTP.cpp
@@ -259,9 +259,9 @@ void GibbsExcessVPSSTP::getActivityCoefficients(doublereal* const ac) const
     // Protect against roundoff when taking exponentials
     for (int k = 0; k < m_kk; k++) {
         if (ac[k] > 700.) {
-            ac[k] = exp(700.);
+            ac[k] = exp(700.0);
         } else if (ac[k] < -700.) {
-            ac[k] = exp(-700);
+            ac[k] = exp(-700.0);
         } else {
             ac[k] = exp(ac[k]);
         }