diff --git a/src/input/zapper.cpp b/src/input/zapper.cpp
index 6fb79621..56a578d4 100644
--- a/src/input/zapper.cpp
+++ b/src/input/zapper.cpp
@@ -145,6 +145,7 @@ static void UpdateZapper(int w, void *data, int arg)
 
 static void LogZapper(int w, MovieRecord* mr)
 {
+	uint32 *ptr=(uint32 *)data;
 	mr->zappers[w].x = ZD[w].mzx;
 	mr->zappers[w].y = ZD[w].mzy;
 	mr->zappers[w].b = ZD[w].mzb;
diff --git a/src/movie.cpp b/src/movie.cpp
index 0aef469e..639bce07 100644
--- a/src/movie.cpp
+++ b/src/movie.cpp
@@ -405,11 +405,12 @@ static void LoadFM2(MovieData& movieData, std::istream* fp, int size=INT_MAX, bo
 		bail:
 		bail = true;
 		if(state == VALUE) goto commit;
+		goto done;
 		commit:
 		movieData.installValue(key,value);
 		state = NEWLINE;
-		if(bail) break;
 		done: ;
+		if(bail) break;
 	}
 }