diff --git a/configure.ac b/configure.ac
index 129be261b3b0919d3d7b9a43626b76567c00ef6a..352558eea3cc8761766f220baaace31718b8427d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,8 @@ AC_CONFIG_FILES([dumux.pc
     dumux/boxmodels/3p3c/Makefile 
     dumux/boxmodels/3p3cni/Makefile 
     dumux/boxmodels/common/Makefile 
+    dumux/boxmodels/co2/Makefile
+    dumux/boxmodels/co2ni/Makefile
     dumux/boxmodels/mpnc/Makefile 
     dumux/boxmodels/mpnc/diffusion/Makefile
     dumux/boxmodels/mpnc/energy/Makefile
diff --git a/dumux/boxmodels/Makefile.am b/dumux/boxmodels/Makefile.am
index 5f36478f489f6920d3bb892789e60d0156d795a6..eff7632454eb4a45a3797935a710d2ffefac5e94 100644
--- a/dumux/boxmodels/Makefile.am
+++ b/dumux/boxmodels/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common 1p 1p2c 2p 2p2c 2p2cni 2pni 3p3c 3p3cni mpnc richards
+SUBDIRS = common co2 co2ni 1p 1p2c 2p 2p2c 2p2cni 2pni 3p3c 3p3cni mpnc richards
 
 boxmodelsdir = $(includedir)/dumux/boxmodels
 
diff --git a/dumux/boxmodels/co2/Makefile.am b/dumux/boxmodels/co2/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..52b76eb57eec33dbc60ca6983b65313fb40dbf7a
--- /dev/null
+++ b/dumux/boxmodels/co2/Makefile.am
@@ -0,0 +1,4 @@
+co2dir = $(includedir)/dumux/boxmodels/co2
+co2_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/boxmodels/co2/co2volumevariables.hh b/dumux/boxmodels/co2/co2volumevariables.hh
index feecbdfa585d40d5b2e2febe96f92a2ca491a9d8..b6a654ece45a49c5ac00613fa631a3bf69608dbb 100644
--- a/dumux/boxmodels/co2/co2volumevariables.hh
+++ b/dumux/boxmodels/co2/co2volumevariables.hh
@@ -307,10 +307,10 @@ public:
               // relative permeabilities
               Scalar kr;
               if (phaseIdx == wPhaseIdx)
-                  kr = MaterialLaw::krw(materialParams, saturation(wPhaseIdx));
+                  kr = MaterialLaw::krw(materialParams, this->saturation(wPhaseIdx));
               else // ATTENTION: krn requires the liquid saturation
                   // as parameter!
-                  kr = MaterialLaw::krn(materialParams, saturation(wPhaseIdx));
+                  kr = MaterialLaw::krn(materialParams, this->saturation(wPhaseIdx));
               ParentType::relativePermeability_[phaseIdx] = kr;
               Valgrind::CheckDefined(ParentType::relativePermeability_[phaseIdx]);
 
diff --git a/dumux/boxmodels/co2ni/Makefile.am b/dumux/boxmodels/co2ni/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..e1f4e3810234b21f380096829ce3abd7582da656
--- /dev/null
+++ b/dumux/boxmodels/co2ni/Makefile.am
@@ -0,0 +1,4 @@
+co2nidir = $(includedir)/dumux/boxmodels/co2ni
+co2ni_HEADERS = *.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
index f280920501a845d7c2d1c124329710175524f098..5196800ba3b010ea1f768c790f634dd5c202d283 100644
--- a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
@@ -58,6 +58,7 @@ NEW_PROP_TAG( GridAdaptEnableSecondHalfEdge ); //!< Uses second interaction volu
 }}
 
 //Dumux includes
+#include <dumux/decoupled/common/gridadaptproperties.hh>
 #include <dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh>
 #include <dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh>
 #include <dumux/decoupled/2p2c/variableclass2p2cadaptive.hh>