diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3dc993f1..7b852a6f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,7 @@ endif()
 # Platform support
 if(WIN32)
 	add_definitions(-D_WIN32_WINNT=0x0600)
-	list(APPEND OS_LIB Ws2_32)
+	list(APPEND OS_LIB ws2_32)
 	file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c)
 	source_group("Windows-specific code" FILES ${OS_SRC})
 else()
diff --git a/src/gba/gba-bios.c b/src/gba/gba-bios.c
index 37094b755..5f11e08e1 100644
--- a/src/gba/gba-bios.c
+++ b/src/gba/gba-bios.c
@@ -318,7 +318,7 @@ static void _unHuffman(struct GBA* gba, uint32_t source, uint32_t* dest) {
 	while (remaining > 0) {
 		uint32_t bitstream = cpu->memory.load32(cpu, sPointer, 0);
 		sPointer += 4;
-		for (bitsRemaining = 32; bitsRemaining > 0; --bitsRemaining, bitstream <<= 1) {
+		for (bitsRemaining = 32; bitsRemaining > 0 && remaining > 0; --bitsRemaining, bitstream <<= 1) {
 			uint32_t next = (nPointer & ~1) + HuffmanNodeGetOffset(node) * 2 + 2;
 			if (bitstream & 0x80000000) {
 				// Go right
diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt
index e577d14f3..39f2cf0c7 100644
--- a/src/platform/sdl/CMakeLists.txt
+++ b/src/platform/sdl/CMakeLists.txt
@@ -5,9 +5,9 @@ if (SDL_VERSION EQUAL "2")
 	include(FindPkgConfig)
 	pkg_search_module(SDL2 sdl2)
 	if (SDL2_FOUND)
-		set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS})
-		set(SDL_LIBRARY ${SDL2_LIBRARIES})
-		set(SDLMAIN_LIBRARY "")
+		set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS} CACHE INTERNAL "")
+		set(SDL_LIBRARY ${SDL2_LIBRARIES} CACHE INTERNAL "")
+		set(SDLMAIN_LIBRARY "" CACHE INTERNAL "")
 		link_directories(${SDL2_LIBDIR})
 	endif()
 endif()
diff --git a/src/platform/windows/memory.c b/src/platform/windows/memory.c
index e7acc9f89..8ecb3b130 100644
--- a/src/platform/windows/memory.c
+++ b/src/platform/windows/memory.c
@@ -1,6 +1,6 @@
 #include "util/memory.h"
 
-#include <Windows.h>
+#include <windows.h>
 
 void* anonymousMemoryMap(size_t size) {
 	return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
diff --git a/src/util/vfs.c b/src/util/vfs.c
index 14b2af2fc..973e96434 100644
--- a/src/util/vfs.c
+++ b/src/util/vfs.c
@@ -10,7 +10,7 @@
 #define PATH_SEP '/'
 #else
 #include <io.h>
-#include <Windows.h>
+#include <windows.h>
 #define PATH_SEP '\\'
 #endif