diff --git a/src/search/cartesian_abstractions/flaw_search.cc b/src/search/cartesian_abstractions/flaw_search.cc
index cf2afabee..bf40c665c 100644
--- a/src/search/cartesian_abstractions/flaw_search.cc
+++ b/src/search/cartesian_abstractions/flaw_search.cc
@@ -574,8 +574,8 @@ unique_ptr<Split> FlawSearch::get_split(const utils::CountdownTimer &cegar_timer
     }
 
     if (split) {
-        assert(!(pick_flawed_abstract_state == PickFlawedAbstractState::MAX_H
-                 || pick_flawed_abstract_state == PickFlawedAbstractState::MIN_H)
+        assert((pick_flawed_abstract_state != PickFlawedAbstractState::MAX_H
+                && pick_flawed_abstract_state != PickFlawedAbstractState::MIN_H)
                || best_flaw_h == get_h_value(split->abstract_state_id));
     }
     return split;
diff --git a/src/search/cost_saturation/saturated_cost_partitioning_online_heuristic.cc b/src/search/cost_saturation/saturated_cost_partitioning_online_heuristic.cc
index ff3dbe8f8..048d9a862 100644
--- a/src/search/cost_saturation/saturated_cost_partitioning_online_heuristic.cc
+++ b/src/search/cost_saturation/saturated_cost_partitioning_online_heuristic.cc
@@ -19,8 +19,8 @@ using namespace std;
 namespace cost_saturation {
 SaturatedCostPartitioningOnlineHeuristic::SaturatedCostPartitioningOnlineHeuristic(
     const shared_ptr<OrderGenerator> &order_generator,
-    const Saturator saturator,
-    const CPFunction cp_function,
+    Saturator saturator,
+    const CPFunction &cp_function,
     Abstractions &&abstractions_,
     unique_ptr<DeadEnds> &&dead_ends_,
     const int interval,
diff --git a/src/search/cost_saturation/saturated_cost_partitioning_online_heuristic.h b/src/search/cost_saturation/saturated_cost_partitioning_online_heuristic.h
index 2a7efac85..542968871 100644
--- a/src/search/cost_saturation/saturated_cost_partitioning_online_heuristic.h
+++ b/src/search/cost_saturation/saturated_cost_partitioning_online_heuristic.h
@@ -46,14 +46,14 @@ class SaturatedCostPartitioningOnlineHeuristic : public Heuristic {
 public:
     SaturatedCostPartitioningOnlineHeuristic(
         const std::shared_ptr<OrderGenerator> &order_generator,
-        const Saturator saturator,
-        const CPFunction cp_function,
+        Saturator saturator,
+        const CPFunction &cp_function,
         Abstractions &&abstractions_,
         std::unique_ptr<DeadEnds> &&dead_ends_,
-        const int interval,
-        const double max_time,
-        const int max_size_kb,
-        const bool debug,
+        int interval,
+        double max_time,
+        int max_size_kb,
+        bool debug,
         const std::shared_ptr<AbstractTask> &transform, bool cache_estimates,
         const std::string &description, utils::Verbosity verbosity);
     virtual ~SaturatedCostPartitioningOnlineHeuristic() override;