diff --git a/CMakeLists.txt b/CMakeLists.txt
index c29840a1..6f84eca0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,15 +64,23 @@ set(scmconvert_HDRS
 
 file(GLOB startool_SRCS
 	src/*.cpp
-	src/kaitai/*.cpp
 	src/dat/*.cpp
+	src/kaitai/*.cpp
+	src/libgrp/*.cpp
+	src/libgrp/Exceptions/*.cpp
+	src/libgrp/GRPFrame/*.cpp
+	src/libgrp/GRPImage/*.cpp
 	src/tileset/*.cpp
 )
 
 file(GLOB startool_HDRS
 	src/*.h
-	src/kaitai/*.h
 	src/dat/*.h
+	src/kaitai/*.h
+	src/libgrp/*.h
+	src/libgrp/Exceptions/*.h
+	src/libgrp/GRPFrame/*.h
+	src/libgrp/GRPImage/*.h
 	src/tileset/*.h
 )
 
@@ -135,8 +143,8 @@ set(startool_LIBS ${scmconvert_LIBS} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${STORML
 
 # Platform specific definitions and compilation settings
 
-add_subdirectory("subprojects/nlohmann-json")
-include_directories("subprojects/nlohmann-json/include")
+add_subdirectory("subprojects/nlohmann_json")
+include_directories("subprojects/nlohmann_json/include")
 set(startool_LIBS ${startool_LIBS} ${NLOHMANN_JSON_TARGET_NAME})
 
 if(WIN32 AND MSVC)
diff --git a/src/libgrp/GRPImage/GRPImage.cpp b/src/libgrp/GRPImage/GRPImage.cpp
index 1b947fca..abce2796 100644
--- a/src/libgrp/GRPImage/GRPImage.cpp
+++ b/src/libgrp/GRPImage/GRPImage.cpp
@@ -99,7 +99,7 @@ bool GRPImage::DetectUncompressed(std::vector<char> *inputImage)
       imagePayload += tempWidth * tempHeight;
     }
 
-    uniqueGRPImages.insert(std::make_pair<uint32_t,bool>((uint32_t)tempDataOffset,true));
+    uniqueGRPImages.insert(std::make_pair(tempDataOffset, true));
 
     if(firstOffset == 0)
     {
diff --git a/stargus.nsi b/stargus.nsi
index 14a9f826..36e652b0 100644
--- a/stargus.nsi
+++ b/stargus.nsi
@@ -245,7 +245,7 @@ Section "-${NAME}"
 
         ; -- XXX TODO: include Stratagus and dependencies some better way
 	File "stratagus.exe"
-	File "*.dll"	
+	;File "*.dll"
 
 	ClearErrors