diff --git a/opm/polymer/PolymerProperties.cpp b/opm/polymer/PolymerProperties.cpp
index 4234a55b7..68bec4479 100644
--- a/opm/polymer/PolymerProperties.cpp
+++ b/opm/polymer/PolymerProperties.cpp
@@ -212,7 +212,8 @@ namespace Opm
         eff_relperm_wat = relperm[0]/rk;
         if (if_with_der) {
             deff_relperm_wat_ds = (drelperm_ds[0]-drelperm_ds[2])/rk; //derivative with respect to sw
-            deff_relperm_wat_dc = dc_ads_dc*relperm[0]/(rk*rk*c_max_ads_);
+            //\frac{\partial k_{rw_eff}}{\parital c} = -\frac{krw}{rk^2}\frac{(RRF-1)}{c^a_{max}}\frac{\partial c^a}{\partial c}.
+            deff_relperm_wat_dc = -(res_factor_ - 1)*dc_ads_dc*relperm[0]/(rk*rk*c_max_ads_); 
         } else {
             deff_relperm_wat_ds = -1.0;
             deff_relperm_wat_dc = -1.0;
diff --git a/opm/polymer/SimulatorPolymer.cpp b/opm/polymer/SimulatorPolymer.cpp
index 4e21fb23d..db18092fb 100644
--- a/opm/polymer/SimulatorPolymer.cpp
+++ b/opm/polymer/SimulatorPolymer.cpp
@@ -30,6 +30,7 @@
 
 #include <opm/core/grid.h>
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/simulator/SimulatorReport.hpp>
@@ -672,8 +673,8 @@ namespace Opm
             const int nw = wells->number_of_wells;
             for (int w = 0; w < nw; ++w) {
                 const WellControls* wc = wells->ctrls[w];
-                if (wc->current >= 0) {
-                    if (wc->type[wc->current] == BHP) {
+                if (well_controls_get_current( wc ) >= 0) {
+                    if (well_controls_get_current_type(wc) == BHP) {
                         return false;
                     }
                 }
@@ -682,6 +683,7 @@ namespace Opm
         }
 
 
+
     } // anonymous namespace