diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp
index 7b3d54253..2b8b9b8de 100755
--- a/desmume/src/movie.cpp
+++ b/desmume/src/movie.cpp
@@ -208,6 +208,23 @@ MovieData::MovieData(bool fromCurrentSettings)
 	, binaryFlag(false)
 	, rtcStart(FCEUI_MovieGetRTCDefault())
 {
+	savestate = false;
+	
+	useExtBios = -1;
+	swiFromBios = -1;
+	useExtFirmware = -1;
+	bootFromFirmware = -1;
+	
+	firmNickname = "";
+	firmMessage = "";
+	firmFavColour = -1;
+	firmBirthMonth = -1;
+	firmBirthDay = -1;
+	firmLanguage = -1;
+	
+	advancedTiming = -1;
+	jitBlockSize = -1;
+	
 	installValueMap["version"] = &MovieData::installVersion;
 	installValueMap["emuVersion"] = &MovieData::installEmuVersion;
 	installValueMap["rerecordCount"] = &MovieData::installRerecordCount;
@@ -904,8 +921,8 @@ static void FCEUMOV_AddCommand(int cmd)
 }
 
 //little endian 4-byte cookies
-static const int kMOVI = 0x49564F4D;
-static const int kNOMO = 0x4F4D4F4E;
+static const u32 kMOVI = 0x49564F4D;
+static const u32 kNOMO = 0x4F4D4F4E;
 
 void mov_savestate(EMUFILE &fp)
 {
diff --git a/desmume/src/movie.h b/desmume/src/movie.h
index 6aecf179d..7b2435418 100755
--- a/desmume/src/movie.h
+++ b/desmume/src/movie.h
@@ -44,13 +44,13 @@ typedef struct
 
 	std::vector<std::wstring> comments;
 	std::vector<std::string> subtitles;
-} MOVIE_INFO;
-
-enum START_FROM
-{
-	START_BLANK = 0,
-	START_SRAM,
-	START_SAVESTATE
+} MOVIE_INFO;
+
+enum START_FROM
+{
+	START_BLANK = 0,
+	START_SRAM,
+	START_SAVESTATE
 };
 
 enum EMOVIEMODE
@@ -149,7 +149,7 @@ public:
 	u32 romChecksum;
 	std::string romSerial;
 	std::string romFilename;
-	bool savestate = false;
+	bool savestate;
 	std::vector<u8> sram;
 	std::vector<MovieRecord> records;
 	std::vector<std::wstring> comments;
@@ -162,20 +162,20 @@ public:
 	//was the frame data stored in binary?
 	bool binaryFlag;
 
-	int useExtBios = -1;
-	int swiFromBios = -1;
-	int useExtFirmware = -1;
-	int bootFromFirmware = -1;
+	int useExtBios;
+	int swiFromBios;
+	int useExtFirmware;
+	int bootFromFirmware;
 
-	std::string firmNickname = "";
-	std::string firmMessage = "";
-	int firmFavColour = -1;
-	int firmBirthMonth = -1;
-	int firmBirthDay = -1;
-	int firmLanguage = -1;
+	std::string firmNickname;
+	std::string firmMessage;
+	int firmFavColour;
+	int firmBirthMonth;
+	int firmBirthDay;
+	int firmLanguage;
 
-	int advancedTiming = -1;
-	int jitBlockSize = -1;
+	int advancedTiming;
+	int jitBlockSize;
 
 	int getNumRecords() { return records.size(); }