diff --git a/opm/autodiff/BlackoilModelBase_impl.hpp b/opm/autodiff/BlackoilModelBase_impl.hpp
index ee45ee5c6..fd5f384e0 100644
--- a/opm/autodiff/BlackoilModelBase_impl.hpp
+++ b/opm/autodiff/BlackoilModelBase_impl.hpp
@@ -2349,12 +2349,10 @@ namespace detail {
 
         const int dims = *std::max_element(fipnum.begin(), fipnum.end());
         std::vector<V> values(dims, V::Zero(5));
-        for (int d = 0; d < dims; ++d) {
-            for (int i = 0; i < 5; ++i) {
-                for (int c = 0; c < nc; ++c) {
-                    if (fipnum[c] == (d + 1)) {
-                        values[d][i] += fip[i][c];
-                    }
+        for (int i = 0; i < 5; ++i) {
+            for (int c = 0; c < nc; ++c) {
+                if (fipnum[c] != 0) {
+                    values[fipnum[c]-1][i] += fip[i][c];
                 }
             }
         }
diff --git a/opm/autodiff/SimulatorBase_impl.hpp b/opm/autodiff/SimulatorBase_impl.hpp
index 8fb4fe8ad..d2c1adb23 100644
--- a/opm/autodiff/SimulatorBase_impl.hpp
+++ b/opm/autodiff/SimulatorBase_impl.hpp
@@ -664,7 +664,7 @@ namespace Opm
                                                   std::vector<V>& fip)
     {
         if (units.getType() == UnitSystem::UnitType::UNIT_TYPE_FIELD) {
-            for (int i = 0; i < fip.size(); ++i) {
+            for (size_t i = 0; i < fip.size(); ++i) {
                 fip[i][0] = unit::convert::to(fip[i][0], unit::stb);
                 fip[i][1] = unit::convert::to(fip[i][1], unit::stb); 
                 fip[i][2] = unit::convert::to(fip[i][2], 1000*unit::cubic(unit::feet));