diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94a0c01..cf8f588 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
 if (PROJECT_IS_TOP_LEVEL)
 	if(MSVC)
 	  add_compile_options(/W4 /WX)
-	  add_compile_options(/arch:AVX2 /Ox)
 	else()
 	  add_compile_options(-Wall -Wextra -Wpedantic -Werror)
 	  add_compile_options(-march=native)
diff --git a/src/vrEmuLcd.h b/src/vrEmuLcd.h
index 98480c0..961ec3f 100644
--- a/src/vrEmuLcd.h
+++ b/src/vrEmuLcd.h
@@ -38,30 +38,30 @@ typedef struct vrEmuLcd_s VrEmuLcd;
 /* PUBLIC CONSTANTS
  * ---------------------------------------- */
 
-const uint8_t LCD_CMD_CLEAR = 0x01;
-const uint8_t LCD_CMD_HOME = 0x02;
-const uint8_t LCD_CMD_ENTRY_MODE = 0x04;
-const uint8_t LCD_CMD_ENTRY_MODE_INCREMENT = 0x02;
-const uint8_t LCD_CMD_ENTRY_MODE_DECREMENT = 0x00;
-const uint8_t LCD_CMD_ENTRY_MODE_SHIFT = 0x01;
-const uint8_t LCD_CMD_DISPLAY = 0x08;
-const uint8_t LCD_CMD_DISPLAY_ON = 0x04;
-const uint8_t LCD_CMD_DISPLAY_CURSOR = 0x02;
-const uint8_t LCD_CMD_DISPLAY_CURSOR_BLINK = 0x01;
-const uint8_t LCD_CMD_SHIFT = 0x10;
-const uint8_t LCD_CMD_SHIFT_CURSOR = 0x00;
-const uint8_t LCD_CMD_SHIFT_DISPLAY = 0x08;
-const uint8_t LCD_CMD_SHIFT_LEFT = 0x00;
-const uint8_t LCD_CMD_SHIFT_RIGHT = 0x04;
-const uint8_t LCD_CMD_FUNCTION = 0x20;
-const uint8_t LCD_CMD_FUNCTION_LCD_1LINE = 0x00;
-const uint8_t LCD_CMD_FUNCTION_LCD_2LINE = 0x08;
-const uint8_t LCD_CMD_FUNCTION_EXT_MODE = 0x04;
-const uint8_t LCD_CMD_FUNCTION_STD_MODE = 0x00;
-const uint8_t LCD_CMD_EXT_FUNCTION_GFX = 0x02;
-const uint8_t LCD_CMD_EXT_FUNCTION_STD = 0x00;
-const uint8_t LCD_CMD_SET_CGRAM_ADDR = 0x40;
-const uint8_t LCD_CMD_SET_DRAM_ADDR = 0x80;
+static const uint8_t LCD_CMD_CLEAR = 0x01;
+static const uint8_t LCD_CMD_HOME = 0x02;
+static const uint8_t LCD_CMD_ENTRY_MODE = 0x04;
+static const uint8_t LCD_CMD_ENTRY_MODE_INCREMENT = 0x02;
+static const uint8_t LCD_CMD_ENTRY_MODE_DECREMENT = 0x00;
+static const uint8_t LCD_CMD_ENTRY_MODE_SHIFT = 0x01;
+static const uint8_t LCD_CMD_DISPLAY = 0x08;
+static const uint8_t LCD_CMD_DISPLAY_ON = 0x04;
+static const uint8_t LCD_CMD_DISPLAY_CURSOR = 0x02;
+static const uint8_t LCD_CMD_DISPLAY_CURSOR_BLINK = 0x01;
+static const uint8_t LCD_CMD_SHIFT = 0x10;
+static const uint8_t LCD_CMD_SHIFT_CURSOR = 0x00;
+static const uint8_t LCD_CMD_SHIFT_DISPLAY = 0x08;
+static const uint8_t LCD_CMD_SHIFT_LEFT = 0x00;
+static const uint8_t LCD_CMD_SHIFT_RIGHT = 0x04;
+static const uint8_t LCD_CMD_FUNCTION = 0x20;
+static const uint8_t LCD_CMD_FUNCTION_LCD_1LINE = 0x00;
+static const uint8_t LCD_CMD_FUNCTION_LCD_2LINE = 0x08;
+static const uint8_t LCD_CMD_FUNCTION_EXT_MODE = 0x04;
+static const uint8_t LCD_CMD_FUNCTION_STD_MODE = 0x00;
+static const uint8_t LCD_CMD_EXT_FUNCTION_GFX = 0x02;
+static const uint8_t LCD_CMD_EXT_FUNCTION_STD = 0x00;
+static const uint8_t LCD_CMD_SET_CGRAM_ADDR = 0x40;
+static const uint8_t LCD_CMD_SET_DRAM_ADDR = 0x80;
 
 
 typedef enum