diff --git a/corsika/detail/modules/OnShellCheck.inl b/corsika/detail/modules/OnShellCheck.inl
index 2702de6e4bd2b6ddbc96dbc2ac240b6174df8285..ec31f8d704bfbc8bea2176ac7da29e41a19cc0ee 100644
--- a/corsika/detail/modules/OnShellCheck.inl
+++ b/corsika/detail/modules/OnShellCheck.inl
@@ -70,7 +70,7 @@ namespace corsika {
         if (abs(e_shift_relative) > energy_tolerance_) {
           logger_->warn("warning! shifted particle energy by {} %",
                         e_shift_relative * 100);
-          if (throw_error_)
+          if (throw_error_) {
             throw std::runtime_error(
                 "OnShellCheck: error! shifted energy by large amount!");
         }
@@ -79,8 +79,10 @@ namespace corsika {
       // reset energy
       p.setEnergy(e_shifted);
     }
-    else CORSIKA_LOGGER_DEBUG(logger_, "particle mass for {} OK", pid);
-  }
-} // namespace corsika
+      else {
+	CORSIKA_LOGGER_DEBUG(logger_, "particle mass for {} OK", pid);
+      }
+    }
+  } // namespace corsika
 
 } // namespace corsika
diff --git a/corsika/detail/modules/pythia8/Interaction.inl b/corsika/detail/modules/pythia8/Interaction.inl
index eb30b23a683e8c43c96164c9bd1cd3e2bf99a4e0..5395e8b1fa86308a4936f6099d34ee851ee67b67 100644
--- a/corsika/detail/modules/pythia8/Interaction.inl
+++ b/corsika/detail/modules/pythia8/Interaction.inl
@@ -70,12 +70,12 @@ namespace corsika::pythia8 {
 
   void Interaction::setUnstable(Code const pCode) {
     CORSIKA_LOG_DEBUG("Pythia::Interaction: setting {} unstable..", pCode);
-    pythia_.particleData.mayDecay(static_cast<int>(get_PDG(pCode)), true);
+    Pythia8::Pythia::particleData.mayDecay(static_cast<int>(get_PDG(pCode)), true);
   }
 
   void Interaction::setStable(Code const pCode) {
     CORSIKA_LOG_DEBUG("Pythia::Interaction: setting {} stable..", pCode);
-    pythia_.particleData.mayDecay(static_cast<int>(get_PDG(pCode)), false);
+    Pythia8::Pythia::particleData.mayDecay(static_cast<int>(get_PDG(pCode)), false);
   }
 
   void Interaction::configureLabFrameCollision(Code const BeamId, Code const TargetId,
diff --git a/tests/framework/testProcessSequence.cpp b/tests/framework/testProcessSequence.cpp
index e4af3534d63f3c68b37f4335c5d9135fa90bfb32..3d60d2de15a57a54a0e0565ad4b568f2a63a944c 100644
--- a/tests/framework/testProcessSequence.cpp
+++ b/tests/framework/testProcessSequence.cpp
@@ -533,14 +533,6 @@ TEST_CASE("SwitchProcessSequence", "ProcessSequence") {
         make_sequence(cp1, Process3(0),
                       make_select(make_sequence(Process1(0), cp2, Decay1(0)),
                                   make_sequence(cp3, Process2(0), Decay2(0)), select1));
-    struct TestSelect {
-      SwitchResult operator()(const DummyData& p) const {
-        CORSIKA_LOG_DEBUG("TestSelect data={}", p.data_[0]);
-        if (p.data_[0] > 0) return SwitchResult::First;
-        return SwitchResult::Second;
-      }
-    };
-    TestSelect select1;
 
     auto switch_seq = SwitchProcessSequence(sequence1, sequence2, select1);
     CHECK(is_process_sequence_v<decltype(switch_seq)>);