diff --git a/src/libslic3r/SLAPrintSteps.cpp b/src/libslic3r/SLAPrintSteps.cpp
index 4cf420a29e..c8dcb9f3be 100644
--- a/src/libslic3r/SLAPrintSteps.cpp
+++ b/src/libslic3r/SLAPrintSteps.cpp
@@ -423,7 +423,7 @@ static void filter_support_points_by_modifiers(
                      !is_enforced && enf_idx < enforcers[idx].size();
                      ++enf_idx)
                 {
-                    if (enforcers[idx][enf_idx].contains_b(sp2d))
+                    if (enforcers[idx][enf_idx].contains(sp2d))
                         is_enforced = true;
                 }
             }
@@ -434,7 +434,7 @@ static void filter_support_points_by_modifiers(
                      !is_blocked && blk_idx < blockers[idx].size();
                      ++blk_idx)
                 {
-                    if (blockers[idx][blk_idx].contains_b(sp2d))
+                    if (blockers[idx][blk_idx].contains(sp2d))
                         is_blocked = true;
                 }
             }
diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp
index 39cf44eb4e..a753220289 100644
--- a/src/slic3r/GUI/GUI_Factories.cpp
+++ b/src/slic3r/GUI/GUI_Factories.cpp
@@ -164,12 +164,12 @@ static const constexpr std::array<std::pair<const char *, const char *>, 5> ADD_
 }};
 
 // Note: id accords to type of the sub-object (adding volume), so sequence of the menu items is important
-const std::vector<std::pair<std::string, std::string>> MenuFactory::TEXT_VOLUME_ICONS {
+static const constexpr std::array<std::pair<const char *, const char *>, 3> TEXT_VOLUME_ICONS {{
 //       menu_item Name              menu_item bitmap name
         {L("Add text"),             "add_text_part"},        // ~ModelVolumeType::MODEL_PART
         {L("Add negative text"),    "add_text_negative" },   // ~ModelVolumeType::NEGATIVE_VOLUME
         {L("Add text modifier"),    "add_text_modifier"},    // ~ModelVolumeType::PARAMETER_MODIFIER
-};
+}};
 
 static Plater* plater()
 {
diff --git a/src/slic3r/GUI/GUI_Factories.hpp b/src/slic3r/GUI/GUI_Factories.hpp
index e418cf6751..81798af9cc 100644
--- a/src/slic3r/GUI/GUI_Factories.hpp
+++ b/src/slic3r/GUI/GUI_Factories.hpp
@@ -33,8 +33,6 @@ struct SettingsFactory
 class MenuFactory
 {
 public:
-    static const std::vector<std::pair<std::string, std::string>> ADD_VOLUME_MENU_ITEMS;
-    static const std::vector<std::pair<std::string, std::string>> TEXT_VOLUME_ICONS;
 	static std::vector<wxBitmapBundle*> get_volume_bitmaps();
 	static std::vector<wxBitmapBundle*> get_text_volume_bitmaps();