diff --git a/CMakeLists.txt b/CMakeLists.txt
index 479ac11..761ee42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,6 @@ cmake_policy(VERSION 3.1)
 
 # define project
 project(rse-texture VERSION 1.0.1 DESCRIPTION "RogueSquadron Extractor - Texture" LANGUAGES C)
-set(CMAKE_BUILD_TYPE Release)
 set(RSE_TEX_NAME RSE_Texture-${PROJECT_VERSION})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h @ONLY)
 
@@ -31,8 +30,10 @@ SOURCE_GROUP("Header Files" FILES ${RSE_TEX_HRDS})
 
 # begin building RSE-Texture
 
+#set(CMAKE_BUILD_TYPE Debug)
 #include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 add_executable(rse-texture ${RSE_TEX_SRCS} ${RSE_TEX_HRDS})
+#set_property(TARGET rse-texture PROPERTY C_STANDARD 99)
 set_target_properties(rse-texture PROPERTIES OUTPUT_NAME ${RSE_TEX_NAME})
 if(MSVC)
 	# msvc does not append 'lib' - do it here to have consistent name
diff --git a/src/HMT_Parser.c b/src/HMT_Parser.c
index f96d333..3163112 100644
--- a/src/HMT_Parser.c
+++ b/src/HMT_Parser.c
@@ -1,8 +1,6 @@
 #include "HMT_Parser.h"
 
 
-extern int _options;	// Global options settings variable
-
 HMT_FILE *parseHMTFile(FILE *hmt_src) {
 	int i;
 	HMT_FILE *_buff = NULL;
@@ -132,12 +130,10 @@ int getSamplesFromFile(RS_IMAGE *img, FILE *f) {
 	int sample_bits = img->sampleBits;
 	int size = div(img->width*img->height*sample_bits, 8).quot;
 
-	/*
-	if (f->_bufsize >= ftell(f)+size) {							//TODO: Check C equivalent
+	if (f->_bufsiz >= ftell(f)+size) {							//TODO: Check C equivalent
 		printf("[ERR] WARNING! Please fix size/sample.");
 		return EXIT_FAILURE;
 	}
-	*/
 
 	img->samples = calloc(1, size);
 	fread(img->samples, size, 1, f);
diff --git a/src/Image_Exporter.c b/src/Image_Exporter.c
index 1642e10..dd43284 100644
--- a/src/Image_Exporter.c
+++ b/src/Image_Exporter.c
@@ -1,8 +1,6 @@
 #include "Image_Exporter.h"
 
 
-extern int _options;	// Global options settings variable
-
 int saveToPNG(RS_IMAGE *img, char *tex_path, char *hmt_fileName) {
 	if (tex_path == NULL || img == NULL) return EXIT_FAILURE;
 	char export_path[128];
diff --git a/src/Texture-Extractor.c b/src/Texture-Extractor.c
index 2f30a81..3123031 100644
--- a/src/Texture-Extractor.c
+++ b/src/Texture-Extractor.c
@@ -10,7 +10,7 @@
 #include "Texture-Extractor.h"
 
 
-extern int _options;	// Global options settings variable
+int _options;	// Global options settings variable
 
 int main(int argc, char *argv[]) {
 	// Init buffer vars
diff --git a/src/options.h b/src/options.h
index 4fc44b8..b8f77ca 100644
--- a/src/options.h
+++ b/src/options.h
@@ -4,6 +4,6 @@
 #define VERBOSE_ENABLED 0x0001
 #define OUTPUT_DIR 0x0002
 
-int _options;
+extern int _options;
 
 #endif