diff --git a/Aquaria/Main.cpp b/Aquaria/Main.cpp
index 720a7ce..cbd4254 100644
--- a/Aquaria/Main.cpp
+++ b/Aquaria/Main.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "DSQ.h"
 #include <fstream>
 #include <SDL.h>
+#include <SDL_main.h>
 
 #ifdef BBGE_BUILD_WINDOWS
 	#define WIN32_LEAN_AND_MEAN
diff --git a/BBGE/OSFunctions.cpp b/BBGE/OSFunctions.cpp
index edac9fc..cc5b637 100644
--- a/BBGE/OSFunctions.cpp
+++ b/BBGE/OSFunctions.cpp
@@ -61,18 +61,21 @@ void initIcon(void *screen)
 	HINSTANCE handle = ::GetModuleHandle(NULL);
 	if(!icon_windows)
 		icon_windows = ::LoadIcon(handle, "icon");
-	SDL_SysWMinfo wminfo;
-	SDL_VERSION(&wminfo.version)
+	if(icon_windows)
+	{
+		SDL_SysWMinfo wminfo;
+		SDL_VERSION(&wminfo.version)
 
 #ifdef BBGE_BUILD_SDL2
-	SDL_GetWindowWMInfo((SDL_Window*)screen, &wminfo);
-	HWND hwnd = wminfo.info.win.window;
+		SDL_GetWindowWMInfo((SDL_Window*)screen, &wminfo);
+		HWND hwnd = wminfo.info.win.window;
 #else
-	SDL_GetWMInfo(&wminfo);
-	HWND hwnd = wminfo.window;
+		SDL_GetWMInfo(&wminfo);
+		HWND hwnd = wminfo.window;
 #endif
 
-	::SetClassLongPtr(hwnd, -14, (LONG) icon_windows); // -14 is GCL_HICON (32bit) or GCLP_HICON (64bit)
+		::SetClassLongPtr(hwnd, -14, (LONG)(uintptr_t)icon_windows); // -14 is GCL_HICON (32bit) or GCLP_HICON (64bit)
+	}
 #endif
 }
 
diff --git a/BBGE/RenderObject.h b/BBGE/RenderObject.h
index f99eae3..3f4f945 100644
--- a/BBGE/RenderObject.h
+++ b/BBGE/RenderObject.h
@@ -260,7 +260,7 @@ public:
 
 	bool cull;
 	float updateCull;
-	unsigned layer;
+	int layer;
 
 	InterpolatedVector *positionSnapTo;
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b53b4c..c6f1028 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,7 +375,8 @@ IF(CMAKE_COMPILER_IS_GNUCC)
     # It doesn't seem to work well, and it adds bulk to the binary.
     CHECK_C_COMPILER_FLAG("-fno-stack-protector" AQUARIA_GCC_HAS_STACKPROT)
     IF(AQUARIA_GCC_HAS_STACKPROT)
-        ADD_DEFINITIONS(-fno-stack-protector)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-stack-protector")
+        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -Wall -fno-stack-protector")
     ENDIF(AQUARIA_GCC_HAS_STACKPROT)
 
     # -O3 breaks on some GCC/MinGW versions, make sure CMake does not set this as default.