diff --git a/external/dispatch/CMakeLists.txt b/external/dispatch/CMakeLists.txt
index 316daa9..ccc5782 100644
--- a/external/dispatch/CMakeLists.txt
+++ b/external/dispatch/CMakeLists.txt
@@ -14,15 +14,34 @@ if (DESKTOP_APP_USE_PACKAGED)
 endif()
 
 if (NOT DESKTOP_APP_DISPATCH_LIBRARIES OR NOT DESKTOP_APP_DISPATCH_INCLUDE_DIRS)
+    if (DESKTOP_APP_SPECIAL_TARGET)
+        set(dispatch_extra_args
+            -DCMAKE_BUILD_TYPE=None
+            "-DCMAKE_C_FLAGS=-g -Ofast -pipe -fPIC -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
+            "-DCMAKE_CXX_FLAGS=-g -Ofast -pipe -fPIC -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
+        )
+    elseif (NOT DESKTOP_APP_USE_PACKAGED)
+        set(dispatch_extra_args
+            -DCMAKE_BUILD_TYPE=Release
+            "-DCMAKE_C_FLAGS=-pipe -fPIC -fstack-protector-all -D_GLIBCXX_ASSERTIONS"
+            "-DCMAKE_CXX_FLAGS=-pipe -fPIC -fstack-protector-all -D_GLIBCXX_ASSERTIONS"
+        )
+    elseif (DEFINED CMAKE_BUILD_TYPE)
+        set(dispatch_extra_args
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        )
+    else()
+        set(dispatch_extra_args)
+    endif()
     execute_process(
         COMMAND ${CMAKE_COMMAND} ${dispatch_loc}
             -B ${dispatch_binary_dir}
             -GNinja
-            -DCMAKE_BUILD_TYPE=Release
             -DCMAKE_C_COMPILER=clang
             -DCMAKE_CXX_COMPILER=clang++
             -DBUILD_SHARED_LIBS=OFF
             -DBUILD_TESTING=OFF
+            ${dispatch_extra_args}
     )
 
     execute_process(
diff --git a/external/jemalloc/CMakeLists.txt b/external/jemalloc/CMakeLists.txt
index f9d2775..a7470a7 100644
--- a/external/jemalloc/CMakeLists.txt
+++ b/external/jemalloc/CMakeLists.txt
@@ -36,8 +36,8 @@ ExternalProject_Add(jemalloc
     CONFIGURE_COMMAND env
         CC=clang
         CXX=clang++
-        "EXTRA_CFLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2"
-        "EXTRA_CXXFLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2"
+        "$<IF:$<OR:$<NOT:$<BOOL:${DESKTOP_APP_USE_PACKAGED}>>,$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>>,EXTRA_CFLAGS=$<$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>:-Ofast> -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS,=>"
+        "$<IF:$<OR:$<NOT:$<BOOL:${DESKTOP_APP_USE_PACKAGED}>>,$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>>,EXTRA_CXXFLAGS=$<$<BOOL:${DESKTOP_APP_SPECIAL_TARGET}>:-Ofast> -fstack-protector-all -DNDEBUG -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS,=>"
         ./autogen.sh --disable-shared
     BUILD_IN_SOURCE 1
     STEP_TARGETS build