diff --git a/src/Entity.c b/src/Entity.c
index d1d5b0ff1..03509161d 100644
--- a/src/Entity.c
+++ b/src/Entity.c
@@ -20,8 +20,8 @@
 #include "Bitmap.h"
 #include "Logger.h"
 
-const char* NameMode_Names[NAME_MODE_COUNT]   = { "None", "Hovered", "All", "AllHovered", "AllUnscaled" };
-const char* ShadowMode_Names[SHADOW_MODE_COUNT] = { "None", "SnapToBlock", "Circle", "CircleAll" };
+const char* const NameMode_Names[NAME_MODE_COUNT]   = { "None", "Hovered", "All", "AllHovered", "AllUnscaled" };
+const char* const ShadowMode_Names[SHADOW_MODE_COUNT] = { "None", "SnapToBlock", "Circle", "CircleAll" };
 
 /*########################################################################################################################*
 *-----------------------------------------------------LocationUpdate------------------------------------------------------*
diff --git a/src/Entity.h b/src/Entity.h
index 5583144d4..db44dbb19 100644
--- a/src/Entity.h
+++ b/src/Entity.h
@@ -22,12 +22,12 @@ extern struct IGameComponent Entities_Component;
 enum NameMode {
 	NAME_MODE_NONE, NAME_MODE_HOVERED, NAME_MODE_ALL, NAME_MODE_ALL_HOVERED, NAME_MODE_ALL_UNSCALED, NAME_MODE_COUNT
 };
-extern const char* NameMode_Names[NAME_MODE_COUNT];
+extern const char* const NameMode_Names[NAME_MODE_COUNT];
 
 enum ShadowMode {
 	SHADOW_MODE_NONE, SHADOW_MODE_SNAP_TO_BLOCK, SHADOW_MODE_CIRCLE, SHADOW_MODE_CIRCLE_ALL, SHADOW_MODE_COUNT
 };
-extern const char* ShadowMode_Names[SHADOW_MODE_COUNT];
+extern const char* const ShadowMode_Names[SHADOW_MODE_COUNT];
 
 enum EntityType { ENTITY_TYPE_NONE, ENTITY_TYPE_PLAYER };
 
diff --git a/src/Input.c b/src/Input.c
index 71ecfa05f..4db90cc38 100644
--- a/src/Input.c
+++ b/src/Input.c
@@ -23,7 +23,7 @@ bool Key_Pressed[KEY_COUNT];
 "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",\
 "U", "V", "W", "X", "Y", "Z"
 
-const char* Key_Names[KEY_COUNT] = {
+const char* const Key_Names[KEY_COUNT] = {
 	"None",
 	Key_Function_Names,
 	"ShiftLeft", "ShiftRight", "ControlLeft", "ControlRight",
@@ -132,7 +132,7 @@ const uint8_t KeyBind_Defaults[KEYBIND_COUNT] = {
 	KEY_F6, KEY_LALT, KEY_F8, 
 	'G', KEY_F10, 0
 };
-const char* KeyBind_Names[KEYBIND_COUNT] = {
+static const char* const keybindNames[KEYBIND_COUNT] = {
 	"Forward", "Back", "Left", "Right",
 	"Jump", "Respawn", "SetSpawn", "Chat", "Inventory", 
 	"ToggleFog", "SendChat", "PlayerList", 
@@ -154,7 +154,7 @@ static void KeyBind_Load(void) {
 	String_InitArray_NT(name, nameBuffer);
 	for (i = 0; i < KEYBIND_COUNT; i++) {
 		name.length = 0;
-		String_Format1(&name, "key-%c", KeyBind_Names[i]);
+		String_Format1(&name, "key-%c", keybindNames[i]);
 		name.buffer[name.length] = '\0';
 
 		mapping = Options_GetEnum(name.buffer, KeyBind_Defaults[i], Key_Names, KEY_COUNT);
@@ -170,7 +170,7 @@ static void KeyBind_Save(void) {
 	String_InitArray(name, nameBuffer);
 	for (i = 0; i < KEYBIND_COUNT; i++) {
 		name.length = 0; 
-		String_Format1(&name, "key-%c", KeyBind_Names[i]);
+		String_Format1(&name, "key-%c", keybindNames[i]);
 
 		value = String_FromReadonly(Key_Names[KeyBinds[i]]);
 		Options_SetString(&name, &value);
diff --git a/src/Input.h b/src/Input.h
index cbed62a1e..6d47b1215 100644
--- a/src/Input.h
+++ b/src/Input.h
@@ -45,7 +45,7 @@ enum Key_ {
 typedef int Key;
 
 /* Simple names for each keyboard button. */
-extern const char* Key_Names[KEY_COUNT];
+extern const char* const Key_Names[KEY_COUNT];
 
 #define Key_IsWinPressed()     (Key_Pressed[KEY_LWIN]   || Key_Pressed[KEY_RWIN])
 #define Key_IsAltPressed()     (Key_Pressed[KEY_LALT]   || Key_Pressed[KEY_RALT])
diff --git a/src/InputHandler.c b/src/InputHandler.c
index b3ee2aa49..2b5161bba 100644
--- a/src/InputHandler.c
+++ b/src/InputHandler.c
@@ -22,8 +22,8 @@
 
 static bool input_buttonsDown[3];
 static int input_pickingId = -1;
-static short normViewDists[10]   = { 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096 };
-static short classicViewDists[4] = { 8, 32, 128, 512 };
+static const short normDists[10]   = { 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096 };
+static const short classicDists[4] = { 8, 32, 128, 512 };
 static TimeMS input_lastClick;
 static float input_fovIndex = -1.0f;
 #ifdef CC_BUILD_WEB
@@ -193,8 +193,8 @@ static bool InputHandler_HandleCoreKey(Key key) {
 			Window_EnterFullscreen();
 		}
 	} else if (key == KeyBinds[KEYBIND_FOG]) {
-		short* viewDists = Gui_ClassicMenu ? classicViewDists : normViewDists;
-		int count = Gui_ClassicMenu ? Array_Elems(classicViewDists) : Array_Elems(normViewDists);
+		const short* viewDists = Gui_ClassicMenu ? classicDists : normDists;
+		int count = Gui_ClassicMenu ? Array_Elems(classicDists) : Array_Elems(normDists);
 
 		if (Key_IsShiftPressed()) {
 			InputHandler_CycleDistanceBackwards(viewDists, count);
diff --git a/src/Program.c b/src/Program.c
index d3dbc089b..436776d5f 100644
--- a/src/Program.c
+++ b/src/Program.c
@@ -106,8 +106,8 @@ static int Program_Run(int argc, char** argv) {
 	int argsCount = Platform_GetCommandLineArgs(argc, argv, args);
 #ifdef _MSC_VER
 	/* NOTE: Make sure to comment this out before pushing a commit */
-	/* String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565"); */
-	String rawArgs = String_FromConst("UnknownShadow200"); 
+	String rawArgs = String_FromConst("UnknownShadow200 fffff 127.0.0.1 25565");
+	//String rawArgs = String_FromConst("UnknownShadow200"); 
 	argsCount = String_UNSAFE_Split(&rawArgs, ' ', args, 4);
 #endif
 
diff --git a/src/Protocol.c b/src/Protocol.c
index 18e0c2047..312973cfa 100644
--- a/src/Protocol.c
+++ b/src/Protocol.c
@@ -717,7 +717,7 @@ static void Classic_Tick(void) {
 /*########################################################################################################################*
 *------------------------------------------------------CPE protocol-------------------------------------------------------*
 *#########################################################################################################################*/
-const char* cpe_clientExtensions[31] = {
+static const char* cpe_clientExtensions[31] = {
 	"ClickDistance", "CustomBlocks", "HeldBlock", "EmoteFix", "TextHotKey", "ExtPlayerList",
 	"EnvColors", "SelectionCuboid", "BlockPermissions", "ChangeModel", "EnvMapAppearance",
 	"EnvWeatherType", "MessageTypes", "HackControl", "PlayerClick", "FullCP437", "LongerMessages",
diff --git a/src/Resources.c b/src/Resources.c
index d9aa50de6..07c3552af 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -24,7 +24,7 @@
 static struct ResourceFile {
 	const char* name;
 	const char* url;
-	uint16_t size;
+	short size;
 	bool downloaded;
 	/* downloaded archive */
 	uint8_t* data; uint32_t len;
@@ -90,7 +90,7 @@ static const struct ResourceSound {
 static struct ResourceMusic {
 	const char* name;
 	const char* hash;
-	uint16_t size;
+	short size;
 	bool downloaded;
 } musicResources[7] = {
 	{ "calm1.ogg", "50a59a4f56e4046701b758ddbb1c1587efa4cadf", 2472 },
diff --git a/src/Vorbis.c b/src/Vorbis.c
index 6574a7870..6a4ca38a2 100644
--- a/src/Vorbis.c
+++ b/src/Vorbis.c
@@ -478,7 +478,7 @@ static void Floor_SortXList(int left, int right) {
 }
 
 static ReturnCode Floor_DecodeSetup(struct VorbisState* ctx, struct Floor* f) {
-	static int16_t ranges[4] = { 256, 128, 84, 64 };
+	static const short ranges[4] = { 256, 128, 84, 64 };
 	int i, j, idx, maxClass;
 	int rangeBits, classNum;
 	int16_t xlist_sorted[FLOOR_MAX_VALUES];
diff --git a/src/World.c b/src/World.c
index 15878dbcf..233e9650c 100644
--- a/src/World.c
+++ b/src/World.c
@@ -124,7 +124,7 @@ if (src != dst) { dst = src; Event_RaiseInt(&WorldEvents.EnvVarChanged, var); }
 if (!PackedCol_Equals(src, dst)) { dst = src; Event_RaiseInt(&WorldEvents.EnvVarChanged, var); }
 
 struct _EnvData Env;
-const char* Weather_Names[3] = { "Sunny", "Rainy", "Snowy" };
+const char* const Weather_Names[3] = { "Sunny", "Rainy", "Snowy" };
 
 const PackedCol Env_DefaultSkyCol    = PACKEDCOL_CONST(0x99, 0xCC, 0xFF, 0xFF);
 const PackedCol Env_DefaultFogCol    = PACKEDCOL_CONST(0xFF, 0xFF, 0xFF, 0xFF);
diff --git a/src/World.h b/src/World.h
index 153b64d1e..68489c272 100644
--- a/src/World.h
+++ b/src/World.h
@@ -113,7 +113,7 @@ CC_VAR extern struct _EnvData {
 #define Env_SidesHeight (Env.EdgeHeight + Env.SidesOffset)
 
 enum Weather_ { WEATHER_SUNNY, WEATHER_RAINY, WEATHER_SNOWY };
-extern const char* Weather_Names[3];
+extern const char* const Weather_Names[3];
 extern const PackedCol Env_DefaultSkyCol, Env_DefaultFogCol, Env_DefaultCloudsCol, Env_DefaultSkyboxCol;
 extern const PackedCol Env_DefaultSunCol, Env_DefaultShadowCol;