diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini
index f23e21b7a..09c44bad7 100644
--- a/resources/profiles/Creality.ini
+++ b/resources/profiles/Creality.ini
@@ -266,8 +266,8 @@ wipe_tower = 1
 wipe_tower_bridging = 10
 wipe_tower_rotation_angle = 0
 wipe_tower_width = 60
-wipe_tower_x = 170
-wipe_tower_y = 140
+wipe_tower_x = 160
+wipe_tower_y = 160
 xy_size_compensation = 0
 extrusion_width = 110%
 external_perimeter_extrusion_width = 105%
@@ -729,7 +729,8 @@ retract_speed = 80
 default_print_profile = 0.16mm NORMAL 0.4 nozzle
 default_filament_profile = Creality PLA
 single_extruder_multi_material = 1
-toolchange_gcode = M600
+toolchange_gcode = M104 S{temperature[next_extruder]}\nM600
+single_extruder_multi_material_priming = 0
 retract_layer_change = 0
 retract_restart_extra = 0
 retract_restart_extra_toolchange = 0
diff --git a/resources/profiles/Voron.ini b/resources/profiles/Voron.ini
index 041c50196..b4d82c86c 100644
--- a/resources/profiles/Voron.ini
+++ b/resources/profiles/Voron.ini
@@ -602,7 +602,6 @@ support_material_contact_distance_type = filament
 support_material_contact_distance_top = 0.15
 support_material_contact_distance_bottom = 0.15
 support_material_interface_contact_loops = 0
- = 1
 support_material_interface_layers = 1
 support_material_interface_pattern = sawtooth
 support_material_interface_spacing = 0
diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp
index 4392944c6..42209e768 100644
--- a/src/libslic3r/PresetBundle.cpp
+++ b/src/libslic3r/PresetBundle.cpp
@@ -1085,7 +1085,7 @@ size_t PresetBundle::load_configbundle(const std::string &path, unsigned int fla
     namespace pt = boost::property_tree;
     pt::ptree tree;
     boost::nowide::ifstream ifs(path);
-#ifdef __WXMSW__
+//#ifdef __WXMSW__
     try {
         pt::read_ini(ifs, tree);
     }catch(const std::exception& ex) {
@@ -1093,9 +1093,9 @@ size_t PresetBundle::load_configbundle(const std::string &path, unsigned int fla
         ss << "Error when reading bundle file " << path << ", error: " << ex.what();
         throw std::exception(ss.str().c_str());
     }
-#else
-        pt::read_ini(ifs, tree);
-#endif
+//#else
+//        pt::read_ini(ifs, tree);
+//#endif
     const VendorProfile *vendor_profile = nullptr;
     if (flags & (LOAD_CFGBNDLE_SYSTEM | LOAD_CFGBUNDLE_VENDOR_ONLY)) {
         auto vp = VendorProfile::from_ini(tree, path);
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index d83690fa0..c8957dead 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -3371,18 +3371,21 @@ void PrintConfigDef::init_fff_params()
 
     def = this->add("single_extruder_multi_material", coBool);
     def->label = L("Single Extruder Multi Material");
+    def->category = OptionCategory::mmsetup;
     def->tooltip = L("The printer multiplexes filaments into a single hot end.");
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("single_extruder_multi_material_priming", coBool);
     def->label = L("Prime all printing extruders");
+    def->category = OptionCategory::mmsetup;
     def->tooltip = L("If enabled, all printing extruders will be primed at the front edge of the print bed at the start of the print.");
     def->mode = comAdvanced;
     def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("wipe_tower_no_sparse_layers", coBool);
     def->label = L("No sparse layers (EXPERIMENTAL)");
+    def->category = OptionCategory::mmsetup;
     def->tooltip = L("If enabled, the wipe tower will not be printed on layers with no toolchanges. "
                      "On layers with a toolchange, extruder will travel downward to print the wipe tower. "
                      "User is responsible for ensuring there is no collision with the print.");