diff --git a/exercises/exercise-basic/README.md b/exercises/exercise-basic/README.md
index ac7eaa57a002015b260fa0a36f287e43edfa24dd..750a957e06f6eaa5ff1eaee874a22bd8177107c7 100644
--- a/exercises/exercise-basic/README.md
+++ b/exercises/exercise-basic/README.md
@@ -95,4 +95,4 @@ make exercise_basic_2pni # builds new executable
 
 <img src="https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/master/exercises/extradoc/exercise1_nonisothermal.png" width="800">
 
-The non-isothermal model requires additional parameters like the thermal conductivity of the solid component. They are already implemented and set in `exercise_basic.input`, you just need to _uncomment_ them.
+The non-isothermal model requires additional parameters like the thermal conductivity of the solid component. They are already implemented and set in `params.input`, you just need to _uncomment_ them.
diff --git a/exercises/exercise-dunemodule/README.md b/exercises/exercise-dunemodule/README.md
index fb2f400ffddb8c47bba9418aa6448d93014c43da..dc204feff9aa800c5c3dc8c6844a01242726da49 100644
--- a/exercises/exercise-dunemodule/README.md
+++ b/exercises/exercise-dunemodule/README.md
@@ -43,7 +43,7 @@ You need to run this command in the folder with content dumux, dumux-course, dun
 mkdir appl
 ```
 
-* Copy some test case from the dumux module, e.g. test_1p from test/porousmediumflow/1p/implicit/compressible/stationary
+* Copy some test case from the dumux module, e.g. test_1p from test/porousmediumflow/1p/implicit/compressible/stationary in your new folder (e.g appl)
 * Copy the problem, spatialparams, cc source file, input file
 
 * Adjust the CMakeLists.txt file within the dumux-example (or your module name)-folder to include your new subdirectory
@@ -74,7 +74,7 @@ cmake build-cmake
 cd build-cmake
 make build_tests
 cd appl
-./test_1p_compressible_tpfa test_1p.input
+./test_1p_compressible_stationary_tpfa params.input
 ```
 
 <hr><br><br>
diff --git a/exercises/exercise-fluidsystem/exercise-fluidsystem.cc b/exercises/exercise-fluidsystem/exercise-fluidsystem.cc
index 7241485ca3eba14e9a28f9991f389b87f546c185..197c32590f582a37a4f2fa4633f6328227aac8ef 100644
--- a/exercises/exercise-fluidsystem/exercise-fluidsystem.cc
+++ b/exercises/exercise-fluidsystem/exercise-fluidsystem.cc
@@ -63,7 +63,7 @@ int main(int argc, char** argv) try
     // define the type tag for this problem
     // TYPETAG is set in CMakeLists.txt as compile time definition
     // alternatively you could write `using TypeTag = Properties::TTag::ExerciseFluidsystemBoxTwoP;`
-    // then, for the 2p2c problem you have to change this line to `using TypeTag = Properties::TTag::ExerciseFluidsystemBoxTwoP;`
+    // then, for the 2p2c problem you have to change this line to `using TypeTag = Properties::TTag::ExerciseFluidsystemBoxTwoPTwoC;`
     // and recompile the executable
     using TypeTag = Properties::TTag::TYPETAG;
 
diff --git a/exercises/exercise-mainfile/exercise_1p_a.cc b/exercises/exercise-mainfile/exercise_1p_a.cc
index 0c624197883ce5eddd7e85bd2316a9f476f1f66c..93a65e39c243c1f08d8dd0b9916c38d94d048562 100644
--- a/exercises/exercise-mainfile/exercise_1p_a.cc
+++ b/exercises/exercise-mainfile/exercise_1p_a.cc
@@ -105,14 +105,14 @@ int main(int argc, char** argv) try
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
     vtkWriter.write(0.0);
-
+    
     Dune::Timer timer;
 
     // TODO: dumux-course-task
     // change the differentiation method to analytic by changing from DiffMethod::numeric to DiffMethod::analytic
 
     // the assembler for stationary problems
-    using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+    using Assembler = FVAssembler<TypeTag, DiffMethod::analytic>;
     auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
 
     // the linear solver
diff --git a/exercises/exercise-properties/mylocalresidual.hh b/exercises/exercise-properties/mylocalresidual.hh
index f47698e5e115969f72df11cd2458b1e2b178afe6..f69e6b6a0d61fbd7412ffd944266908af58f6b9f 100644
--- a/exercises/exercise-properties/mylocalresidual.hh
+++ b/exercises/exercise-properties/mylocalresidual.hh
@@ -53,7 +53,7 @@ class MyLocalResidual : public GetPropType<TypeTag, Properties::BaseLocalResidua
     using EnergyLocalResidual = GetPropType<TypeTag, Properties::EnergyLocalResidual>;
 
     using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr int numPhases = ModelTraits::numPhases();
+    static constexpr int numPhases = ModelTraits::numFluidPhases();
     static constexpr int conti0EqIdx = ModelTraits::Indices::conti0EqIdx; //!< first index for the mass balance
 
 public: