diff --git a/deps/imgui/CMakeLists.txt b/deps/imgui/CMakeLists.txt
index c18ca47..3fbdb9e 100644
--- a/deps/imgui/CMakeLists.txt
+++ b/deps/imgui/CMakeLists.txt
@@ -15,3 +15,8 @@ add_library(
 		backends/imgui_impl_glfw.cpp
 		backends/imgui_impl_opengl3.cpp
 )
+
+target_include_directories(
+	imgui SYSTEM PUBLIC
+		.
+)
\ No newline at end of file
diff --git a/deps/nfde/CMakeLists.txt b/deps/nfde/CMakeLists.txt
index 0b6949a..863eb4f 100644
--- a/deps/nfde/CMakeLists.txt
+++ b/deps/nfde/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 project(nativefiledialog-extended)
 
 if(NOT MSVC)
diff --git a/src/nostalgia/CMakeLists.txt b/src/nostalgia/CMakeLists.txt
index d644bae..4600ff5 100644
--- a/src/nostalgia/CMakeLists.txt
+++ b/src/nostalgia/CMakeLists.txt
@@ -5,11 +5,16 @@ project(nostalgia CXX)
 
 set(NOSTALGIA_BUILD_PLAYER ON CACHE BOOL "Build Player")
 set(NOSTALGIA_BUILD_STUDIO ON CACHE BOOL "Build Studio")
+set(NOSTALGIA_BUILD_STUDIO_APP ON CACHE BOOL "Build Studio App")
 
 if(BUILDCORE_TARGET STREQUAL "gba")
 	set(NOSTALGIA_BUILD_STUDIO OFF)
 endif()
 
+if(NOT NOSTALGIA_BUILD_STUDIO)
+	set(NOSTALGIA_BUILD_STUDIO_APP OFF)
+endif()
+
 if(APPLE)
 	set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia")
 	set(NOSTALGIA_DIST_BIN              NostalgiaStudio.app/Contents/MacOS)
@@ -32,7 +37,7 @@ endif()
 
 if(NOT BUILDCORE_TARGET STREQUAL "gba")
 	add_subdirectory(tools)
-	if(${NOSTALGIA_BUILD_STUDIO})
+	if(${NOSTALGIA_BUILD_STUDIO_APP})
 		add_subdirectory(studio)
 	endif()
 endif()