diff --git a/desmume/src/frontend/cocoa/cocoa_core.mm b/desmume/src/frontend/cocoa/cocoa_core.mm
index ef91088d2..50e2d2fe3 100644
--- a/desmume/src/frontend/cocoa/cocoa_core.mm
+++ b/desmume/src/frontend/cocoa/cocoa_core.mm
@@ -929,7 +929,7 @@ volatile bool execute = true;
 								dateSecond,
 								dateMillisecond);
 	
-	FCEUI_SaveMovie(fileName, L"Test Author", 0, sramPath, rtcDate);
+	FCEUI_SaveMovie(fileName, L"Test Author", START_BLANK, sramPath, rtcDate);
 	
 	return YES;
 }
diff --git a/desmume/src/frontend/posix/gtk/main.cpp b/desmume/src/frontend/posix/gtk/main.cpp
index edd4d272f..0b8ba7d0f 100644
--- a/desmume/src/frontend/posix/gtk/main.cpp
+++ b/desmume/src/frontend/posix/gtk/main.cpp
@@ -1,6 +1,6 @@
  /*
 	Copyright (C) 2007 Pascal Giard (evilynux)
-	Copyright (C) 2006-2017 DeSmuME team
+	Copyright (C) 2006-2018 DeSmuME team
  
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -1064,7 +1064,7 @@ static void RecordMovieDialog()
     switch(gtk_dialog_run(GTK_DIALOG(pFileSelection))) {
     case GTK_RESPONSE_OK:
         sPath = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(pFileSelection));
-        FCEUI_SaveMovie(sPath,L"",0,"", FCEUI_MovieGetRTCDefault());
+        FCEUI_SaveMovie(sPath,L"",START_BLANK,"", FCEUI_MovieGetRTCDefault());
         g_free(sPath);
         break;
     default:
diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp
old mode 100644
new mode 100755
index 05e664107..7b3d54253
--- a/desmume/src/movie.cpp
+++ b/desmume/src/movie.cpp
@@ -208,6 +208,35 @@ MovieData::MovieData(bool fromCurrentSettings)
 	, binaryFlag(false)
 	, rtcStart(FCEUI_MovieGetRTCDefault())
 {
+	installValueMap["version"] = &MovieData::installVersion;
+	installValueMap["emuVersion"] = &MovieData::installEmuVersion;
+	installValueMap["rerecordCount"] = &MovieData::installRerecordCount;
+	installValueMap["romFilename"] = &MovieData::installRomFilename;
+	installValueMap["romChecksum"] = &MovieData::installRomChecksum;
+	installValueMap["romSerial"] = &MovieData::installRomSerial;
+	installValueMap["guid"] = &MovieData::installGuid;
+	installValueMap["rtcStart"] = &MovieData::installRtcStart;
+	installValueMap["rtcStartNew"] = &MovieData::installRtcStartNew;
+	
+	installValueMap["comment"] = &MovieData::installComment;
+	installValueMap["binary"] = &MovieData::installBinary;
+	installValueMap["useExtBios"] = &MovieData::installUseExtBios;
+	installValueMap["swiFromBios"] = &MovieData::installSwiFromBios;
+	installValueMap["useExtFirmware"] = &MovieData::installUseExtFirmware;
+	installValueMap["bootFromFirmware"] = &MovieData::installBootFromFirmware;
+	
+	installValueMap["firmNickname"] = &MovieData::installFirmNickname;
+	installValueMap["firmMessage"] = &MovieData::installFirmMessage;
+	installValueMap["firmFavColour"] = &MovieData::installFirmFavColour;
+	installValueMap["firmBirthMonth"] = &MovieData::installFirmBirthMonth;
+	installValueMap["firmBirthDay"] = &MovieData::installFirmBirthDay;
+	installValueMap["firmLanguage"] = &MovieData::installFirmLanguage;
+	
+	installValueMap["advancedTiming"] = &MovieData::installAdvancedTiming;
+	installValueMap["jitBlockSize"] = &MovieData::installJitBlockSize;
+	installValueMap["savestate"] = &MovieData::installSavestate;
+	installValueMap["sram"] = &MovieData::installSram;
+	
 	if (fromCurrentSettings)
 	{
 		useExtBios = CommonSettings.UseExtBIOS;
diff --git a/desmume/src/movie.h b/desmume/src/movie.h
old mode 100644
new mode 100755
index 9daa77d7b..6aecf179d
--- a/desmume/src/movie.h
+++ b/desmume/src/movie.h
@@ -28,7 +28,6 @@
 #include "utils/guid.h"
 #include "utils/md5.h"
 
-enum START_FROM { START_BLANK, START_SRAM, START_SAVESTATE };
 
 struct UserInput;
 class EMUFILE;
@@ -45,7 +44,14 @@ typedef struct
 
 	std::vector<std::wstring> comments;
 	std::vector<std::string> subtitles;
-} MOVIE_INFO;
+} MOVIE_INFO;
+
+enum START_FROM
+{
+	START_BLANK = 0,
+	START_SRAM,
+	START_SAVESTATE
+};
 
 enum EMOVIEMODE
 {
@@ -239,33 +245,7 @@ private:
 	void installSram(std::string& val);
 
 	typedef void(MovieData::* ivm)(std::string&);
-	std::map<std::string, ivm> installValueMap = {
-		{"version", &MovieData::installVersion},
-		{"emuVersion", &MovieData::installEmuVersion},
-		{"rerecordCount", &MovieData::installRerecordCount},
-		{"romFilename", &MovieData::installRomFilename},
-		{"romChecksum", &MovieData::installRomChecksum},
-		{"romSerial", &MovieData::installRomSerial},
-		{"guid", &MovieData::installGuid},
-		{"rtcStart", &MovieData::installRtcStart},
-		{"rtcStartNew", &MovieData::installRtcStartNew},
-		{"comment", &MovieData::installComment},
-		{"binary", &MovieData::installBinary},
-		{"useExtBios", &MovieData::installUseExtBios},
-		{"swiFromBios", &MovieData::installSwiFromBios},
-		{"useExtFirmware", &MovieData::installUseExtFirmware},
-		{"bootFromFirmware", &MovieData::installBootFromFirmware},
-		{"firmNickname", &MovieData::installFirmNickname},
-		{"firmMessage", &MovieData::installFirmMessage},
-		{"firmFavColour", &MovieData::installFirmFavColour},
-		{"firmBirthMonth", &MovieData::installFirmBirthMonth},
-		{"firmBirthDay", &MovieData::installFirmBirthDay},
-		{"firmLanguage", &MovieData::installFirmLanguage},
-		{"advancedTiming", &MovieData::installAdvancedTiming},
-		{"jitBlockSize", &MovieData::installJitBlockSize},
-		{"savestate", &MovieData::installSavestate},
-		{"sram", &MovieData::installSram}
-	};
+	std::map<std::string, ivm> installValueMap;
 };
 
 extern int currFrameCounter;
diff --git a/desmume/src/wifi.cpp b/desmume/src/wifi.cpp
index efee5643f..32dd233c4 100755
--- a/desmume/src/wifi.cpp
+++ b/desmume/src/wifi.cpp
@@ -469,7 +469,7 @@ static void WIFI_triggerIRQ(u8 irq)
 		{
 			if (io.POWER_TX.AutoWakeup != 0)
 			{
-				io.RF_STATUS.Status = 0x1;
+				io.RF_STATUS.RFStatus = 0x1;
 				io.RF_PINS.CarrierSense = 0;
 				io.RF_PINS.TXMain = 0;
 				io.RF_PINS.UNKNOWN1 = 1;
@@ -511,7 +511,7 @@ static void WIFI_triggerIRQ(u8 irq)
 		{
 			if (io.POWER_TX.AutoSleep != 0)
 			{
-				io.RF_STATUS.Status = 0x9;
+				io.RF_STATUS.RFStatus = 0x9;
 				io.RF_PINS.CarrierSense = 0;
 				io.RF_PINS.TXMain = 1;
 				io.RF_PINS.UNKNOWN1 = 1;
@@ -712,7 +712,7 @@ static void WIFI_TXStart(const WifiTXLocIndex txSlotIndex, IOREG_W_TXBUF_LOCATIO
 			
 			io.RXTX_ADDR.HalfwordAddress = address;
 			
-			io.RF_STATUS.Status = 0x03;
+			io.RF_STATUS.RFStatus = 0x03;
 			io.RF_PINS.CarrierSense = 0;
 			io.RF_PINS.TXMain = 1;
 			io.RF_PINS.UNKNOWN1 = 1;
@@ -2065,7 +2065,7 @@ void WIFI_write16(u32 address, u16 val)
 					}
 					else
 					{
-						io.RF_STATUS.Status = 0x9;
+						io.RF_STATUS.RFStatus = 0x9;
 						io.RF_PINS.CarrierSense = 0;
 						io.RF_PINS.TXMain = 1;
 						io.RF_PINS.UNKNOWN1 = 1;
@@ -2975,10 +2975,10 @@ void WIFI_usTrigger()
 				
 				WIFI_triggerIRQ(WIFI_IRQ_TXEND);
 				
-				//io.RF_STATUS.Status = 0x01;
+				//io.RF_STATUS.RFStatus = 0x01;
 				//io.RF_PINS.RX_On = 1;
 				
-				io.RF_STATUS.Status = 0x09;
+				io.RF_STATUS.RFStatus = 0x09;
 				io.RF_PINS.CarrierSense = 0;
 				io.RF_PINS.TXMain = 0;
 				io.RF_PINS.UNKNOWN1 = 1;
diff --git a/desmume/src/wifi.h b/desmume/src/wifi.h
index 7d5680179..1e20113e2 100755
--- a/desmume/src/wifi.h
+++ b/desmume/src/wifi.h
@@ -2265,15 +2265,15 @@ typedef union
 	struct
 	{
 #ifndef MSB_FIRST
-		u16 Status:4;
-		u16 empty:4;
+		u16 RFStatus:4;
+		u16 :4;
 		
-		u16 empty2:8;
+		u16 :8;
 #else
-		u16 empty2:8;
+		u16 :8;
 		
-		u16 empty:4;
-		u16 Status:4;
+		u16 :4;
+		u16 RFStatus:4;
 #endif
 	};
 } IOREG_W_RF_STATUS;								// 0x4808214