diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e33058edc..aa5cc1628 100755
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20070516
+--------
+main/game.c, main/inferno.c, main/newmenu.c: free grabbed mouse in Demo Playback; improved Player-files deletion
+
 20070514
 --------
 SConstruct, arch/sdl/init.c, arch/sdl/joydefs.c, arch/sdl/mouse.c, arch/include/mouse.h, include/error.h, main/config.h main/game.c, main/gamecntl.c, main/inferno.c, main/kconfig.c, main/kconfig.h, main/newmenu.c, main/newmenu.h, main/playsave.c, main/text.h: Added config field to map a Mouse Axis/Wheel to cycle Primary and Secondary weapons; lots of controls-related code cleaning
diff --git a/main/gamecntl.c b/main/gamecntl.c
index 47d0d4bab..34be4c650 100755
--- a/main/gamecntl.c
+++ b/main/gamecntl.c
@@ -536,7 +536,7 @@ int do_game_pause()
 	}
 
 	/* keep the mouse from wandering in SDL */
-	if (FindArg("-grabmouse"))
+	if (FindArg("-grabmouse") && (Newdemo_state != ND_STATE_PLAYBACK))
 	    SDL_WM_GrabInput(SDL_GRAB_ON);
 
 	clear_boxed_message();
diff --git a/main/inferno.c b/main/inferno.c
index 285ce354f..b3dc38819 100755
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -813,7 +813,7 @@ int main(int argc, char *argv[])
 			#endif
 
 			/* keep the mouse from wandering in SDL */
-			if (FindArg("-grabmouse"))
+			if (FindArg("-grabmouse") && (Newdemo_state != ND_STATE_PLAYBACK))
 			    SDL_WM_GrabInput(SDL_GRAB_ON);
 
 			game();
diff --git a/main/newmenu.c b/main/newmenu.c
index d70c63fa1..586147f52 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -2211,8 +2211,8 @@ ReadFileNames:
 
 					if ((!ret) && player_mode)	{
 						delete_player_saved_games( &filenames[citem*14] );
-						// also delete PLX file
-						sprintf(plxfile,"%.8s.plx",Players[Player_num].callsign);
+						// delete PLX file
+						sprintf(plxfile,"%.8s.plx",&filenames[citem*14]);
 						if (cfexist(plxfile))
 							PHYSFS_delete(plxfile);
 					}