diff --git a/regression-tests/multigpu_test/slurm4GPU.job b/regression-tests/multigpu_test/slurm4GPU.job
index 8afc3cd349de4d704eab6d7073925f81f81c0ad3..70b33f07f4a4a7be7f5b50990098f3322238af4a 100755
--- a/regression-tests/multigpu_test/slurm4GPU.job
+++ b/regression-tests/multigpu_test/slurm4GPU.job
@@ -10,8 +10,8 @@
 ##SBATCH --exclusive
 
 module purge 
-module load comp/ccache/4.1 # loads comp/gcc/9.3.0 
-module load mpi/openmpi/4.0.5_gcc_9.3/openmpi 
+module load comp/gcc/10.2.0
+module load mpi/openmpi/4.0.5_gcc_9.3/openmpi
 module load cuda/11.3
 module load comp/git/2.27.0
 PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
@@ -19,7 +19,7 @@ PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
 module list
 
 cd multigpu_test
-mkdir -p build
+rm -r build && mkdir -p build
 cd build
 cmake .. -DBUILD_VF_GPU=ON -DCMAKE_CUDA_ARCHITECTURES=60 -DUSER_APPS=apps/gpu/LBM/DrivenCavityMultiGPU\;apps/gpu/LBM/SphereScaling
 make -j 16
diff --git a/regression-tests/multigpu_test/slurm8GPU.job b/regression-tests/multigpu_test/slurm8GPU.job
index ad8027e9d3c9627d06bcf0857692c40d00fc67ae..b91d7d473d935d4d0fbe8deba344dbaa58cf5080 100755
--- a/regression-tests/multigpu_test/slurm8GPU.job
+++ b/regression-tests/multigpu_test/slurm8GPU.job
@@ -10,8 +10,8 @@
 ##SBATCH --exclusive
 
 module purge 
-module load comp/ccache/4.1 # loads comp/gcc/9.3.0 
-module load mpi/openmpi/4.0.5_gcc_9.3/openmpi 
+module load comp/gcc/10.2.0
+module load mpi/openmpi/4.0.5_gcc_9.3/openmpi
 module load cuda/11.3
 module load comp/git/2.27.0
 PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
@@ -19,7 +19,7 @@ PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
 module list
 
 cd multigpu_test
-mkdir -p build
+rm -r build && mkdir -p build
 cd build
 cmake .. -DBUILD_VF_GPU=ON -DCMAKE_CUDA_ARCHITECTURES=60 -DUSER_APPS=apps/gpu/LBM/DrivenCavityMultiGPU\;apps/gpu/LBM/SphereScaling
 make -j 16
diff --git a/src/lbm/BGK.cpp b/src/lbm/BGK.cpp
index 5d1993c872b1aefea801e6e2d2c602a82ecd9281..b59572293e3ffd8f15e8edc864b2993e48b00296 100644
--- a/src/lbm/BGK.cpp
+++ b/src/lbm/BGK.cpp
@@ -2,10 +2,9 @@
 
 
 #include <basics/DataTypes.h>
+#include <basics/constants/NumericConstants.h>
 
-#include "constants/NumericConstants.h"
 #include "constants/D3Q27.h"
-
 #include "MacroscopicQuantities.h"
 
 namespace vf::lbm
diff --git a/src/lbm/CumulantChimera.cpp b/src/lbm/CumulantChimera.cpp
index f8e11d468471efe96b3d9e17c356b8c1a3d59ff8..f1257c4e579b36f868f3476282e79d44291750b1 100644
--- a/src/lbm/CumulantChimera.cpp
+++ b/src/lbm/CumulantChimera.cpp
@@ -1,12 +1,11 @@
-#include "CumulantChimera.h"
 
 #include <cmath>
 
 #include <basics/DataTypes.h>
+#include <basics/constants/NumericConstants.h>
 
-#include "constants/NumericConstants.h"
 #include "constants/D3Q27.h"
-
+#include "CumulantChimera.h"
 #include "Chimera.h"
 #include "MacroscopicQuantities.h"
 
diff --git a/src/lbm/MacroscopicQuantities.h b/src/lbm/MacroscopicQuantities.h
index 751c874f1c240f5502ccaef5f6e540be1e5d28ff..5a93222a5efae2d1814411053360d66ef132d62c 100644
--- a/src/lbm/MacroscopicQuantities.h
+++ b/src/lbm/MacroscopicQuantities.h
@@ -9,8 +9,8 @@
 #endif
 
 #include <basics/DataTypes.h>
+#include <basics/constants/NumericConstants.h>
 
-#include "constants/NumericConstants.h"
 #include "constants/D3Q27.h"