diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
index 5ccad0bbba..4b61965454 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
@@ -459,7 +459,7 @@ void GLGizmoFdmSupports::update_model_object() const
         if (! mv->is_model_part())
             continue;
         ++idx;
-        updated |= mv->supported_facets.set(*m_triangle_selectors[idx].get());
+        updated |= mv->supported_facets.set(*m_triangle_selectors[idx]);
     }
 
     if (updated) {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
index 4fb5a5a6bd..adb89913e8 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -509,7 +509,7 @@ void GLGizmoMmuSegmentation::update_model_object() const
         if (! mv->is_model_part())
             continue;
         ++idx;
-        updated |= mv->mm_segmentation_facets.set(*m_triangle_selectors[idx].get());
+        updated |= mv->mm_segmentation_facets.set(*m_triangle_selectors[idx]);
     }
 
     if (updated) {
@@ -699,7 +699,7 @@ void GLMmSegmentationGizmo3DScene::render(size_t triangle_indices_idx) const
     glsafe(::glBindBuffer(GL_ARRAY_BUFFER, this->vertices_VBO_id));
     const GLint position_id = shader->get_attrib_location("v_position");
     if (position_id != -1) {
-        glsafe(::glVertexAttribPointer(position_id, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (GLvoid*)0));
+        glsafe(::glVertexAttribPointer(position_id, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (GLvoid*)nullptr));
         glsafe(::glEnableVertexAttribArray(position_id));
     }
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
index 7bec4c78b6..a8e51962dd 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
@@ -104,7 +104,7 @@ public:
     // will be also extended to support additional states, requiring at least one state to remain free out of 19 states.
     static const constexpr size_t EXTRUDERS_LIMIT = 16;
 
-    const float get_cursor_radius_min() const override { return CursorRadiusMin; }
+    float get_cursor_radius_min() const override { return CursorRadiusMin; }
 
 protected:
     ColorRGBA get_cursor_sphere_left_button_color() const override;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
index 31f38cc743..7ae82e4333 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
@@ -97,9 +97,9 @@ public:
     // after all volumes (including transparent ones) are rendered.
     virtual void render_painter_gizmo() = 0;
 
-    virtual const float get_cursor_radius_min() const { return CursorRadiusMin; }
-    virtual const float get_cursor_radius_max() const { return CursorRadiusMax; }
-    virtual const float get_cursor_radius_step() const { return CursorRadiusStep; }
+    virtual float get_cursor_radius_min() const { return CursorRadiusMin; }
+    virtual float get_cursor_radius_max() const { return CursorRadiusMax; }
+    virtual float get_cursor_radius_step() const { return CursorRadiusStep; }
 
     /// <summary>
     /// Implement when want to process mouse events in gizmo
@@ -192,7 +192,6 @@ private:
 
     static std::shared_ptr<GLModel> s_sphere;
 
-    bool m_internal_stack_active = false;
     bool m_schedule_update = false;
     Vec2d m_last_mouse_click = Vec2d::Zero();
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
index 5f90c3459d..080c2cb2ec 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
@@ -201,7 +201,7 @@ void GLGizmoSeam::update_model_object() const
         if (! mv->is_model_part())
             continue;
         ++idx;
-        updated |= mv->seam_facets.set(*m_triangle_selectors[idx].get());
+        updated |= mv->seam_facets.set(*m_triangle_selectors[idx]);
     }
 
     if (updated) {