diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 7e1afb5a8a..2347225ab7 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -1099,7 +1099,6 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
     m_volumetric_speed = DoExport::autospeed_volumetric_limit(print);
     print.throw_if_canceled();
 
-    m_cooling_buffer = make_unique<CoolingBuffer>(*this);
     if (print.config().spiral_vase.value)
         m_spiral_vase = make_unique<SpiralVase>(print.config());
 #ifdef HAS_PRESSURE_EQUALIZER
@@ -1212,6 +1211,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
     }
     print.throw_if_canceled();
 
+    m_cooling_buffer = make_unique<CoolingBuffer>(*this);
     m_cooling_buffer->set_current_extruder(initial_extruder_id);
 
     // Emit machine envelope limits for the Marlin firmware.
diff --git a/src/libslic3r/GCode/SpiralVase.cpp b/src/libslic3r/GCode/SpiralVase.cpp
index acb6ad0348..c3caee2dc4 100644
--- a/src/libslic3r/GCode/SpiralVase.cpp
+++ b/src/libslic3r/GCode/SpiralVase.cpp
@@ -54,7 +54,7 @@ std::string SpiralVase::process_layer(const std::string &gcode)
     // For absolute extruder distances it will be switched off.
     // Tapering the absolute extruder distances requires to process every extrusion value after the first transition
     // layer.
-    bool  transition = m_transition_layer && m_config->use_relative_e_distances.value;
+    bool  transition = m_transition_layer && m_config.use_relative_e_distances.value;
     float layer_height_factor = layer_height / total_layer_length;
     float len = 0.f;
     m_reader.parse_buffer(gcode, [&new_gcode, &z, total_layer_length, layer_height_factor, transition, &len]
diff --git a/src/libslic3r/GCode/SpiralVase.hpp b/src/libslic3r/GCode/SpiralVase.hpp
index 5353901fe6..fb461c2015 100644
--- a/src/libslic3r/GCode/SpiralVase.hpp
+++ b/src/libslic3r/GCode/SpiralVase.hpp
@@ -8,10 +8,10 @@ namespace Slic3r {
 
 class SpiralVase {
 public:
-    SpiralVase(const PrintConfig &config) : m_config(&config)
+    SpiralVase(const PrintConfig &config) : m_config(config)
     {
-        m_reader.z() = (float)m_config->z_offset;
-        m_reader.apply_config(*m_config);
+        m_reader.z() = (float)m_config.z_offset;
+        m_reader.apply_config(m_config);
     };
 
     void 		enable(bool en) {
@@ -22,7 +22,7 @@ public:
     std::string process_layer(const std::string &gcode);
     
 private:
-    const PrintConfig  *m_config;
+    const PrintConfig  &m_config;
     GCodeReader 		m_reader;
 
     bool 				m_enabled = false;
@@ -32,4 +32,4 @@ private:
 
 }
 
-#endif
+#endif // slic3r_SpiralVase_hpp_