diff --git a/src/slic3r/GUI/CalibrationAbstractDialog.hpp b/src/slic3r/GUI/CalibrationAbstractDialog.hpp
index a6e87dec8..96706af8e 100644
--- a/src/slic3r/GUI/CalibrationAbstractDialog.hpp
+++ b/src/slic3r/GUI/CalibrationAbstractDialog.hpp
@@ -49,7 +49,7 @@ protected:
 
 };
 
-class ProgressIndicatorStub : ProgressIndicator {
+class ProgressIndicatorStub : public ProgressIndicator {
 public:
 
     virtual ~ProgressIndicatorStub() override = default;
diff --git a/tests/fff_print/test_data.cpp b/tests/fff_print/test_data.cpp
index ca78a76bb..080523d19 100644
--- a/tests/fff_print/test_data.cpp
+++ b/tests/fff_print/test_data.cpp
@@ -165,7 +165,7 @@ void init_print(std::vector<TriangleMesh> &&meshes, Slic3r::Print &print, Slic3r
 	for (const TriangleMesh &t : meshes) {
 		ModelObject *object = model.add_object();
 		object->name += "object.stl";
-		object->add_volume(std::move(t));
+		object->add_volume(t);
 		object->add_instance();
 	}
 
@@ -175,7 +175,7 @@ void init_print(std::vector<TriangleMesh> &&meshes, Slic3r::Print &print, Slic3r
     }
 
 	print.apply(model, config);
-    arrange_objects(&print, model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
+    arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
     print.apply(model, config);
     print.validate();
     print.set_status_silent();
diff --git a/tests/fff_print/test_model.cpp b/tests/fff_print/test_model.cpp
index c437a507d..d734677bc 100644
--- a/tests/fff_print/test_model.cpp
+++ b/tests/fff_print/test_model.cpp
@@ -43,7 +43,7 @@ SCENARIO("Model construction", "[Model]") {
             }
             model_object->add_instance();
             print.apply(model, config); // apply config for arrange_objects
-            arrange_objects(&print, model, InfiniteBed{ scaled(Vec2d(100, 100)) }, ArrangeParams{ scaled(print.config().min_object_distance()) });
+            arrange_objects(model, InfiniteBed{ scaled(Vec2d(100, 100)) }, ArrangeParams{ scaled(print.config().min_object_distance()) });
 			model_object->ensure_on_bed();
 			print.auto_assign_extruders(model_object);
 			THEN("Print works?") {
diff --git a/tests/superslicerlibslic3r/test_complete_objects.cpp b/tests/superslicerlibslic3r/test_complete_objects.cpp
index d2f2b97ce..5ff5bd7d4 100644
--- a/tests/superslicerlibslic3r/test_complete_objects.cpp
+++ b/tests/superslicerlibslic3r/test_complete_objects.cpp
@@ -38,7 +38,7 @@ std::unique_ptr<Print> init_print_with_dist(DynamicPrintConfig &config, float di
 
     if (distance <= 0) {
         print->apply(model, config);
-        arrange_objects(print.get(), model, InfiniteBed{}, ArrangeParams{ scaled(/*min_object_distance(config)) });/*/ print->config().min_object_distance(&print->config(), 999999)) });
+        arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(/*min_object_distance(config)) });/*/ PrintConfig::min_object_distance(&print->config(), 999999)) });
         model.center_instances_around_point(Slic3r::Vec2d(100, 100));
     }
 
diff --git a/tests/superslicerlibslic3r/test_data.cpp b/tests/superslicerlibslic3r/test_data.cpp
index fba077374..23a19ffce 100644
--- a/tests/superslicerlibslic3r/test_data.cpp
+++ b/tests/superslicerlibslic3r/test_data.cpp
@@ -288,7 +288,7 @@ void init_print(Print& print, std::initializer_list<TestMesh> meshes, Slic3r::Mo
     }
 
     print.apply(model, config); // apply config for the arrange_objects
-    arrange_objects(&print, model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
+    arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
     model.center_instances_around_point(Slic3r::Vec2d(100,100));
     for (auto* mo : model.objects) {
         print.auto_assign_extruders(mo);
@@ -324,7 +324,7 @@ void init_print(Print& print, std::vector<TriangleMesh> meshes, Slic3r::Model& m
     }
 
     print.apply(model, config); // apply config for the arrange_objects
-    arrange_objects(&print, model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
+    arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
     model.center_instances_around_point(Slic3r::Vec2d(100,100));
 	print.apply(model, config);
 	for (ModelObject* mo : model.objects) {