diff --git a/SDK/include/NDK/Application.hpp b/SDK/include/NDK/Application.hpp
index 8c0eb18a9..b3f803fe1 100644
--- a/SDK/include/NDK/Application.hpp
+++ b/SDK/include/NDK/Application.hpp
@@ -127,12 +127,14 @@ namespace Ndk
 			template<typename T> void SetupWindow(WindowInfo& info, T* renderTarget, std::true_type /*isRenderTarget*/);
 			template<typename T> void SetupWindow(WindowInfo& /*info*/, T* /*renderTarget*/, std::false_type /*isNotRenderTarget*/);
 
-			std::map<Nz::String, Nz::String> m_parameters;
-			std::set<Nz::String> m_options;
 			std::vector<WindowInfo> m_windows;
 			#endif
+
+			std::map<Nz::String, Nz::String> m_parameters;
+			std::set<Nz::String> m_options;
 			std::list<World> m_worlds;
 			Nz::Clock m_updateClock;
+
 			#ifndef NDK_SERVER
 			Nz::UInt32 m_overlayFlags;
 			bool m_exitOnClosedWindows;
diff --git a/SDK/include/NDK/Application.inl b/SDK/include/NDK/Application.inl
index 7701160c5..2c74acb19 100644
--- a/SDK/include/NDK/Application.inl
+++ b/SDK/include/NDK/Application.inl
@@ -350,6 +350,7 @@ namespace Ndk
 		return s_application;
 	}
 
+	#ifndef NDK_SERVER
 	template<typename T>
 	inline void Application::SetupWindow(WindowInfo& info, T* renderTarget, std::true_type)
 	{
@@ -372,7 +373,6 @@ namespace Ndk
 	{
 	}
 
-	#ifndef NDK_SERVER
 	inline Application::WindowInfo::WindowInfo(std::unique_ptr<Nz::Window>&& window) :
 	window(std::move(window)),
 	renderTarget(nullptr)
diff --git a/SDK/src/NDK/Application.cpp b/SDK/src/NDK/Application.cpp
index 68396f128..3cdff6978 100644
--- a/SDK/src/NDK/Application.cpp
+++ b/SDK/src/NDK/Application.cpp
@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
 #include <NDK/Application.hpp>
+#include <Nazara/Core/Log.hpp>
 #include <regex>
 
 #ifndef NDK_SERVER
@@ -63,11 +64,13 @@ namespace Ndk
 				NazaraWarning("Ignored command-line argument #" + Nz::String::Number(i) + " \"" + argument + '"');
 		}
 
+		#ifndef NDK_SERVER
 		if (HasOption("console"))
 			EnableConsole(true);
 
 		if (HasOption("fpscounter"))
 			EnableFPSCounter(true);
+		#endif
 	}
 
 	/*!