diff --git a/src/application/application.cpp b/src/application/application.cpp
index f6bfc382..fa092b5f 100644
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -74,6 +74,8 @@ class ApplicationDisplayData
 protected:
 #if __ANDROID__
     //NOT HANDLED YET
+#elif __NX__
+    nx::app_display display;
 #elif LOL_USE_SDL
     sdl::app_display display;
 #elif HAVE_GLES_2X
@@ -139,7 +141,7 @@ class ApplicationData
 #if __ANDROID__
     AndroidApp app;
 #elif __NX__
-    NxApp app;
+    nx::app app;
 #elif LOL_USE_SDL
     sdl::app app;
 #elif HAVE_GLES_2X
diff --git a/src/lol-core.vcxproj b/src/lol-core.vcxproj
index 7f9d0d18..abc95d9b 100644
--- a/src/lol-core.vcxproj
+++ b/src/lol-core.vcxproj
@@ -90,7 +90,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions);LOL_INPUT_V2</PreprocessorDefinitions>
-      <OptimizationLevel Condition="'$(Configuration)|$(Platform)'=='Debug|NX64'">O1</OptimizationLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/src/private/nx b/src/private/nx
index 840d8e58..fff1694e 160000
--- a/src/private/nx
+++ b/src/private/nx
@@ -1 +1 @@
-Subproject commit 840d8e587789c51e51f76c603eb4e1fb30581eae
+Subproject commit fff1694e85ed1e06bda630fb494d09c5df6ba510