diff --git a/src/fceu-types.h b/src/fceu-types.h
index dda3a8e..cc8f7c5 100644
--- a/src/fceu-types.h
+++ b/src/fceu-types.h
@@ -39,7 +39,7 @@ typedef uint32_t uint32;
 typedef unsigned long long uint64;
 typedef long long int64;
 	#define GINLINE inline
-#elif MSVC
+#elif MSVC | _MSC_VER
 typedef __int64 int64;
 typedef unsigned __int64 uint64;
 	#define GINLINE		/* Can't declare a function INLINE
diff --git a/src/ines.c b/src/ines.c
index 9bb3ef7..715d808 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -844,7 +844,12 @@ static int iNES_Init(int num) {
 				AddExState(VROM, CHRRAMSize, 0, "CHRR");
 			}
 			if (head.ROM_type & 8)
-				AddExState(ExtraNTARAM, 2048, 0, "EXNR");
+			{
+				if (ExtraNTARAM != NULL)
+				{
+					AddExState(ExtraNTARAM, 2048, 0, "EXNR");
+				}
+			}
 			tmp->init(&iNESCart);
 			return 1;
 		}