diff --git a/opm/autodiff/BlackoilDetails.hpp b/opm/autodiff/BlackoilDetails.hpp
index 16b2ab06b..d0afc2e8a 100644
--- a/opm/autodiff/BlackoilDetails.hpp
+++ b/opm/autodiff/BlackoilDetails.hpp
@@ -226,8 +226,7 @@ namespace detail {
             assert(nw * np == int(residual_well.size()));
 
             // Do the global reductions
-#if 0
-            HAVE_MPI
+#if 0 // HAVE_MPI
             if ( linsolver_.parallelInformation().type() == typeid(ParallelISTLInformation) )
             {
                 const ParallelISTLInformation& info =
diff --git a/opm/autodiff/BlackoilModelEbos.hpp b/opm/autodiff/BlackoilModelEbos.hpp
index afcfa17eb..11e21d15e 100644
--- a/opm/autodiff/BlackoilModelEbos.hpp
+++ b/opm/autodiff/BlackoilModelEbos.hpp
@@ -168,8 +168,8 @@ namespace Opm {
         , well_model_ (well_model)
         , terminal_output_ (terminal_output)
         , current_relaxation_(1.0)
-        , isBeginReportStep_(false)
         , dx_old_(AutoDiffGrid::numCells(grid_))
+        , isBeginReportStep_(false)
         {
             const double gravity = detail::getGravity(geo_.gravity(), UgGridHelpers::dimensions(grid_));
             const std::vector<double> pv(geo_.poreVolume().data(), geo_.poreVolume().data() + geo_.poreVolume().size());
diff --git a/opm/autodiff/StandardWellsDense.hpp b/opm/autodiff/StandardWellsDense.hpp
index 5f7409f34..fb916c901 100644
--- a/opm/autodiff/StandardWellsDense.hpp
+++ b/opm/autodiff/StandardWellsDense.hpp
@@ -829,13 +829,14 @@ namespace Opm {
 
                         if (pu.phase_used[BlackoilPhases::Vapour]) {
                             int gaspos = pu.phase_pos[BlackoilPhases::Vapour] + perf * pu.num_phases;
+                            int gaspos_well = pu.phase_pos[BlackoilPhases::Vapour] + w * pu.num_phases;
 
                             if (pu.phase_used[BlackoilPhases::Liquid]) {
-                                int oilpos = pu.phase_pos[BlackoilPhases::Liquid] + perf * pu.num_phases;
-                                const double oilrate = std::abs(xw.wellRates()[oilpos]); //in order to handle negative rates in producers
+                                int oilpos_well = pu.phase_pos[BlackoilPhases::Liquid] + w * pu.num_phases;
+                                const double oilrate = std::abs(xw.wellRates()[oilpos_well]); //in order to handle negative rates in producers
                                 rvmax_perf[perf] = FluidSystem::gasPvt().saturatedOilVaporizationFactor(fs.pvtRegionIndex(), temperature, p_avg);
                                 if (oilrate > 0) {
-                                    const double gasrate = std::abs(xw.wellRates()[gaspos]);
+                                    const double gasrate = std::abs(xw.wellRates()[gaspos_well]);
                                     double rv = 0.0;
                                     if (gasrate > 0) {
                                         rv = oilrate / gasrate;
@@ -855,12 +856,13 @@ namespace Opm {
 
                         if (pu.phase_used[BlackoilPhases::Liquid]) {
                             int oilpos = pu.phase_pos[BlackoilPhases::Liquid] + perf * pu.num_phases;
+                            int oilpos_well = pu.phase_pos[BlackoilPhases::Liquid] + w * pu.num_phases;
                             if (pu.phase_used[BlackoilPhases::Vapour]) {
                                 rsmax_perf[perf] = FluidSystem::oilPvt().saturatedGasDissolutionFactor(fs.pvtRegionIndex(), temperature, p_avg);
-                                int gaspos = pu.phase_pos[BlackoilPhases::Vapour] + perf * pu.num_phases;
-                                const double gasrate = std::abs(xw.wellRates()[gaspos]);
+                                int gaspos_well = pu.phase_pos[BlackoilPhases::Vapour] + w * pu.num_phases;
+                                const double gasrate = std::abs(xw.wellRates()[gaspos_well]);
                                 if (gasrate > 0) {
-                                    const double oilrate = std::abs(xw.wellRates()[oilpos]);
+                                    const double oilrate = std::abs(xw.wellRates()[oilpos_well]);
                                     double rs = 0.0;
                                     if (oilrate > 0) {
                                         rs = gasrate / oilrate;