diff --git a/.hgsubstate b/.hgsubstate
index 48a7a0a..cade95e 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,2 +1,2 @@
 07ae49ffab2c469150c67856880b120f8e96930b dune/porsol/opmpressure
-ae290a8ecfed207381b872a4bdc896018fa0e0a4 dune/porsol/opmtransport
+1cc1976d9349fddc9573e813841e6d4d4daa87d8 dune/porsol/opmtransport
diff --git a/dune/porsol/euler/EulerUpstreamImplicit.hpp b/dune/porsol/euler/EulerUpstreamImplicit.hpp
index ee62b64..d4b9d47 100644
--- a/dune/porsol/euler/EulerUpstreamImplicit.hpp
+++ b/dune/porsol/euler/EulerUpstreamImplicit.hpp
@@ -47,7 +47,7 @@ along with OpenRS.  If not, see <http://www.gnu.org/licenses/>.
 #include <dune/porsol/opmtransport/src/JacobianSystem.hpp>
 
 #include <dune/common/SparseVector.hpp>
-#include <dune/porsol/opmtransport/examples/ImplicitTransportDefs.hpp>
+#include <dune/porsol/common/ImplicitTransportDefs.hpp>
 
 
 
diff --git a/dune/porsol/euler/EulerUpstreamImplicit_impl.hpp b/dune/porsol/euler/EulerUpstreamImplicit_impl.hpp
index a615b3f..f3a0c13 100644
--- a/dune/porsol/euler/EulerUpstreamImplicit_impl.hpp
+++ b/dune/porsol/euler/EulerUpstreamImplicit_impl.hpp
@@ -50,7 +50,7 @@
 #include <dune/grid/common/Volumes.hpp>
 //#include <dune/porsol/euler/CflCalculator.hpp>
 #include <dune/common/StopWatch.hpp>
-#include <dune/porsol/opmtransport/examples/ImplicitTransportDefs.hpp>
+#include <dune/porsol/common/ImplicitTransportDefs.hpp>
 #include <vector>
 #include <array>
 #include <dune/porsol/opmpressure/src/trans_tpfa.h>
@@ -114,7 +114,8 @@ namespace Dune
     	for (int i = 0; i < mygrid_.numCells(); ++i){
     		porevol_[i]= mygrid_.cellVolume(i)*r.porosity(i);
     	}
-    	trans_.resize(mygrid_.numFaces());
+    	int numf=mygrid_.numFaces();
+    	trans_.resize(numf);
     	//grid_t* cgrid=mygrid_.c_grid();
     	std::array<int,2> cell;
     	int num_cells = mygrid_.numCells();
@@ -133,7 +134,7 @@ namespace Dune
     	    	count +=1;
     	    }
     	}
-        for(int i=0; i < trans_.size();++i){
+        for(int i=0; i < numf;++i){
         	trans_[i]= 1/trans_[i];
         }
     	myrp_= r;
@@ -267,7 +268,8 @@ namespace Dune
 		//    src[grid->number_of_cells - 1] = -1.0;
 	    Opm::TransportSource tsrc;//create_transport_source(0, 2);
 	    // the input flux is assumed to be the satuation times the flux in the transport solver
-	    for(int i=0; i <direclet_cells_.size(); ++i){
+	    int num_b=direclet_cells_.size();
+	    for(int i=0; i <num_b; ++i){
 	    	std::array<double,2> sat = {{saturation[2*i] ,saturation[2*i+1] }};
 	    	std::array<double,2> mob;
 	    	std::array<double,2> dmob;