diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba2fec68f..71b8c217e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,7 @@ if(EdgeTX_SUPERBUILD)
 
   add_custom_target(simu
     COMMAND ${CMAKE_COMMAND} --build native --target simu
+    DEPENDS native-configure
   )
 
   add_custom_target(wasi-module
diff --git a/cmake/FetchImgui.cmake b/cmake/FetchImgui.cmake
index 2beb108ec..cba13e14a 100644
--- a/cmake/FetchImgui.cmake
+++ b/cmake/FetchImgui.cmake
@@ -6,23 +6,26 @@ FetchContent_Declare(
   imgui
   GIT_REPOSITORY https://github.com/ocornut/imgui
   GIT_TAG        dbb5eeaadffb6a3ba6a60de1290312e5802dba5a # v1.91.8
-  SOURCE_DIR     imgui
+  GIT_SHALLOW    TRUE
+  UPDATE_DISCONNECTED TRUE
 )
 
 FetchContent_MakeAvailable(imgui)
 
+message("Fetched imgui source code from Github: ${imgui_SOURCE_DIR}")
+
 add_library(imgui STATIC
-  imgui/imgui.cpp
-  imgui/imgui_draw.cpp
-  imgui/imgui_tables.cpp
-  imgui/imgui_widgets.cpp
-  imgui/backends/imgui_impl_sdl2.cpp
-  imgui/backends/imgui_impl_sdlrenderer2.cpp
+  ${imgui_SOURCE_DIR}/imgui.cpp
+  ${imgui_SOURCE_DIR}/imgui_draw.cpp
+  ${imgui_SOURCE_DIR}/imgui_tables.cpp
+  ${imgui_SOURCE_DIR}/imgui_widgets.cpp
+  ${imgui_SOURCE_DIR}/backends/imgui_impl_sdl2.cpp
+  ${imgui_SOURCE_DIR}/backends/imgui_impl_sdlrenderer2.cpp
 )
 
 target_include_directories(imgui PUBLIC
-  ${CMAKE_CURRENT_BINARY_DIR}/imgui
-  ${CMAKE_CURRENT_BINARY_DIR}/imgui/backends
+  ${imgui_SOURCE_DIR}
+  ${imgui_SOURCE_DIR}/backends
 )
 
 target_link_libraries(imgui PUBLIC SDL2::SDL2)
diff --git a/cmake/wasm/CMakeLists.txt b/cmake/wasm/CMakeLists.txt
index 727c6ac8a..1562abe25 100644
--- a/cmake/wasm/CMakeLists.txt
+++ b/cmake/wasm/CMakeLists.txt
@@ -35,6 +35,7 @@ ExternalProject_Add(wasm
     -DEdgeTX_SUPERBUILD:BOOL=0
     -DNATIVE_BUILD:BOOL=1
     -DDISABLE_COMPANION:BOOL=1
+  BUILD_ALWAYS TRUE
   BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target wasi-module
   INSTALL_COMMAND ""
 )