diff --git a/apps/benchmarks/UniformGridGenerated/UniformGrid.prm b/apps/benchmarks/UniformGridGenerated/UniformGrid.prm
index cf2f26ad8ba9d68a1dd34aa09725da0f645661f9..aae6bc2c01bd6948f791eea80ce1188c06d0d6ab 100644
--- a/apps/benchmarks/UniformGridGenerated/UniformGrid.prm
+++ b/apps/benchmarks/UniformGridGenerated/UniformGrid.prm
@@ -1,14 +1,14 @@
 DomainSetup
 {
    blocks        <  1,    1,   1 >;
-   cellsPerBlock <  64, 64, 64 >;
-   periodic      <  1,    1,   1 >;
+   cellsPerBlock <  128, 128, 128 >;
+   periodic      <  0,    0,   0 >;
 }
 
 Parameters 
 {
 
-	timesteps       3000;   // time steps of one performance measurement
+	timesteps       1000;   // time steps of one performance measurement
 	warmupSteps     1;      // number of steps to run before measurement starts
     outerIterations 1;      // how many measurements to conduct
 
@@ -18,5 +18,6 @@ Parameters
     directComm 1;
 
 	omega 1.8;
+	shearVelocityMagnitude 0;
 	useGui 0;
 }
diff --git a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp
index f8865e8dc7bec85addd160461a9d47b7da658589..f3b620a5b191d2652b48a69b04f0fd728c369d6b 100644
--- a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp
+++ b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.cpp
@@ -77,7 +77,8 @@ int main( int argc, char **argv )
       pystencils::GenMacroSetter setterKernel(pdfFieldId, velFieldId);
       pystencils::GenMacroGetter getterKernel(pdfFieldId, velFieldId);
 
-      initShearVelocity(blocks, velFieldId, shearVelocityMagnitude);
+      if( shearVelocityMagnitude > 0 )
+          initShearVelocity(blocks, velFieldId, shearVelocityMagnitude);
       for( auto & b : *blocks)
           setterKernel(&b);
 
diff --git a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
index 893ffb763790ad14f5d7cba64549fefe3ab408bd..72f0ce0c10c18f92fe4d46de9d22b50b49ff4aa8 100644
--- a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
+++ b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
@@ -92,6 +92,8 @@ with CodeGeneration() as ctx:
         'aa_odd_cse_global': False,
         'aa_odd_split': True,
         'aa_odd_nt_stores': False,
+
+        'compiled_in_boundaries': True,
     }
     config_name = ctx.config
     noopt = False
@@ -118,9 +120,7 @@ with CodeGeneration() as ctx:
                                                                 'cse_global': opts['two_field_cse_global'],
                                                                 'cse_pdfs': opts['two_field_cse_pdfs']}, **options)
 
-    include_boundaries = True
-
-    if include_boundaries:
+    if opts['compiled_in_boundaries']:
         from lbmpy.boundaries import NoSlip, UBB
         from lbmpy.boundaries.boundaries_in_kernel import update_rule_with_push_boundaries
         from collections import OrderedDict