diff --git a/CMakePresets.json b/CMakePresets.json
index cb453a905..9854e2c67 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -44,8 +44,11 @@
       "name": "default-windows",
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
+        //"CMAKE_BUILD_TYPE": "Release",
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        //"CMAKE_BUILD_TYPE": "Debug",
         "DEBUG_OUTPUT": "ON",
+        "SANITIZE_ADDRESS": "OFF",
         "RX_SAMPLE_24BIT": "ON",
         "ARCH_OPT": "SSE4_2",
         "HIDE_CONSOLE": "OFF",
@@ -55,11 +58,11 @@
         "ENABLE_HACKRF": "ON",
         "ENABLE_IIO": "ON",
         "ENABLE_MIRISDR": "OFF",
-        "ENABLE_PERSEUS": "ON",
+        "ENABLE_PERSEUS": "OFF",
         "ENABLE_RTLSDR": "ON",
         "ENABLE_SDRPLAY": "ON",
         "ENABLE_SOAPYSDR": "ON",
-        "ENABLE_XTRX": "ON",
+        "ENABLE_XTRX": "OFF",
         "ENABLE_USRP": "ON",
         "BUILD_SERVER": "OFF",
         "CMAKE_PREFIX_PATH": "C:/Qt/5.15.2/msvc2019_64;C:/Applications/boost_1_81_0"
@@ -87,7 +90,14 @@
       "binaryDir": "${sourceDir}/build-qt6",
       "cacheVariables": {
         "ENABLE_QT6": "ON",
-        "CMAKE_PREFIX_PATH": "C:/Qt/6.7.3/msvc2022_64;C:/Applications/boost_1_81_0"
+        "CMAKE_PREFIX_PATH": "C:/Qt/6.7.3/msvc2022_64;C:/Applications/boost_1_81_0",
+        "CMAKE_BUILD_TYPE": "Release"
+        //"CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        //"CMAKE_BUILD_TYPE": "Debug"
+        //"BUILD_SERVER": "ON",
+        //"RX_SAMPLE_24BIT": "OFF",
+        //"ENABLE_CHANNELMIMO_DOA2": "OFF",
+        //"ENABLE_CHANNELMIMO_INTERFEROMETER":  "OFF"
       }
     }
   ],
diff --git a/cmake/cpack/deploy_mac.cmake.in b/cmake/cpack/deploy_mac.cmake.in
index 450238452..b383095c9 100644
--- a/cmake/cpack/deploy_mac.cmake.in
+++ b/cmake/cpack/deploy_mac.cmake.in
@@ -52,7 +52,7 @@ execute_process ( COMMAND echo "signature checked" )
 
 # Run macdeployqt which should copy all libraries and frameworks and Qt plugins and qml
 message ("Running macdeployqt in ${CPACK_TEMPORARY_INSTALL_DIRECTORY}")
-execute_process ( COMMAND macdeployqt ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app -no-strip -always-overwrite -verbose=1 -qmldir=@CMAKE_CURRENT_SOURCE_DIR@/../../plugins/ )
+execute_process ( COMMAND macdeployqt ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app -always-overwrite -verbose=1 -qmldir=@CMAKE_CURRENT_SOURCE_DIR@/../../plugins/ )
 
 execute_process ( COMMAND echo "checking signature post" )
 execute_process ( COMMAND codesign -vv ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/Frameworks/libusb-1.0.0.dylib )
diff --git a/launch.vs.json b/launch.vs.json
new file mode 100644
index 000000000..9109ef060
--- /dev/null
+++ b/launch.vs.json
@@ -0,0 +1,20 @@
+{
+  "version": "0.2.1",
+  "defaults": {},
+  "configurations": [
+    {
+      "type": "default",
+      "project": "CMakeLists.txt",
+      "projectTarget": "sdrangel.exe (bin\\sdrangel.exe)",
+      "name": "sdrangel.exe (bin\\sdrangel.exe)",
+      //"args": [ "--remote-tcp", "--remote-tcp-hwtype", "RTLSDR", "--remote-tcp-port", "4321", "--remote-tcp-address", "127.0.0.1" ]
+    },
+    {
+      "type": "default",
+      "project": "CMakeLists.txt",
+      "projectTarget": "sdrangelsrv.exe (bin\\sdrangelsrv.exe)",
+      "name": "sdrangelsrv.exe (bin\\sdrangelsrv.exe)",
+      "args": [ "--remote-tcp", "--remote-tcp-hwtype", "RTLSDR" ]
+    }
+  ]
+}
\ No newline at end of file