diff --git a/Core/MemoryDumper.cpp b/Core/MemoryDumper.cpp
index 794eb718..3405fd44 100644
--- a/Core/MemoryDumper.cpp
+++ b/Core/MemoryDumper.cpp
@@ -256,6 +256,7 @@ uint8_t MemoryDumper::GetMemoryValue(DebugMemoryType memoryType, uint32_t addres
 		case DebugMemoryType::ChrRam:
 		case DebugMemoryType::WorkRam:
 		case DebugMemoryType::SaveRam:
+		case DebugMemoryType::NametableRam:
 			return _mapper->GetMemoryValue(memoryType, address);
 
 		case DebugMemoryType::InternalRam: return _memoryManager->DebugRead(address);
diff --git a/Core/ShortcutKeyHandler.cpp b/Core/ShortcutKeyHandler.cpp
index c22f9540..2ecdb91a 100644
--- a/Core/ShortcutKeyHandler.cpp
+++ b/Core/ShortcutKeyHandler.cpp
@@ -274,7 +274,7 @@ void ShortcutKeyHandler::ProcessKeys()
 
 	if(_runSingleFrameRepeatTimer) {
 		double elapsedMs = _runSingleFrameRepeatTimer->GetElapsedMS();
-		if(_repeatStarted && elapsedMs >= 50 || !_repeatStarted && elapsedMs >= 500) {
+		if((_repeatStarted && elapsedMs >= 50) || (!_repeatStarted && elapsedMs >= 500)) {
 			//Over 500ms has elapsed since the key was first pressed, or over 50ms since repeat mode started (20fps)
 			//In this case, run another frame and pause again.
 			_repeatStarted = true;
diff --git a/Lua/compat.h b/Lua/compat.h
index e2ab307c..f2a740ed 100644
--- a/Lua/compat.h
+++ b/Lua/compat.h
@@ -4,6 +4,10 @@
 #include "lua.h"
 #include "lauxlib.h"
 
+#ifndef _WIN32
+	#define gai_strerrorA gai_strerror
+#endif
+
 #if LUA_VERSION_NUM==501
 void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup);
 void *luaL_testudata ( lua_State *L, int arg, const char *tname);