diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 945328a00..aae3436ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -153,12 +153,12 @@ endif ()
 # Also the shim may load the Mesa software OpenGL renderer if the default renderer does not support OpenGL 2.0 and higher.
 if (MSVC)
     add_executable(slic3r_app_gui WIN32 slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc)
-    target_compile_definitions(slic3r_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE -DSLIC3R_WRAPPER_GUI)
+    target_compile_definitions(slic3r_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
     add_dependencies(slic3r_app_gui slic3r)
     set_target_properties(slic3r_app_gui PROPERTIES OUTPUT_NAME "slic3r")
 
     add_executable(slic3r_app_console slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc)
-    target_compile_definitions(slic3r_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE -DSLIC3R_WRAPPER_NOGUI)
+    target_compile_definitions(slic3r_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE)
     add_dependencies(slic3r_app_console slic3r)
     set_target_properties(slic3r_app_console PROPERTIES OUTPUT_NAME "slic3r-console")
 endif ()
diff --git a/src/slic3r_app_msvc.cpp b/src/slic3r_app_msvc.cpp
index ff5ad6cfa..48c166406 100644
--- a/src/slic3r_app_msvc.cpp
+++ b/src/slic3r_app_msvc.cpp
@@ -206,11 +206,8 @@ int wmain(int argc, wchar_t **argv)
 
 	std::vector<wchar_t*> argv_extended;
 	argv_extended.emplace_back(argv[0]);
-#ifdef SLIC3R_WRAPPER_GUI
-	std::wstring cmd_gui = L"--gui";
-	argv_extended.emplace_back(const_cast<wchar_t*>(cmd_gui.data()));
-#endif
-	for (int i = 1; i < argc; ++i)
+	// Here one may push some additional parameters based on the wrapper type.
+	for (int i = 1; i < argc; ++ i)
 		argv_extended.emplace_back(argv[i]);
 	argv_extended.emplace_back(nullptr);
 
diff --git a/xs/src/perlglue.cpp b/xs/src/perlglue.cpp
index 1a551d67b..eea5ad54f 100644
--- a/xs/src/perlglue.cpp
+++ b/xs/src/perlglue.cpp
@@ -251,7 +251,7 @@ bool ConfigBase__set(ConfigBase* THIS, const t_config_option_key &opt_key, SV* v
     case coPoint:
         return from_SV_check(value, &static_cast<ConfigOptionPoint*>(opt)->value);
     case coPoint3:
-        return from_SV_check(value, &static_cast<ConfigOptionPoint3*>(&opt)->value);
+        return from_SV_check(value, &static_cast<ConfigOptionPoint3*>(opt)->value);
     case coPoints:
     {
         std::vector<Vec2d> &values = static_cast<ConfigOptionPoints*>(opt)->values;