diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 54cbdd536d..6d5a78b897 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -485,9 +485,6 @@ static void NewGRFWndProc(Window *w, WindowEvent *e)
 			break;
 
 		case WE_DESTROY:
-			if (!WP(w, newgrf_d).execute) {
-				CopyGRFConfigList(WP(w, newgrf_d).orig_list, *WP(w, newgrf_d).list);
-			}
 			/* Remove the temporary copy of grf-list used in window */
 			ClearGRFConfigList(WP(w, newgrf_d).list);
 			break;
diff --git a/src/saveload.cpp b/src/saveload.cpp
index 8e5348bc1a..4922419e68 100644
--- a/src/saveload.cpp
+++ b/src/saveload.cpp
@@ -1593,8 +1593,13 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode)
 			/* No loader found, treat as version 0 and use LZO format */
 			if (fmt == endof(_saveload_formats)) {
 				DEBUG(sl, 0, "Unknown savegame type, trying to load it as the buggy format");
-
+#if defined(WINCE)
+				/* Of course some system had not to support rewind ;) */
+				fseek(_sl.fh, 0L, SEEK_SET);
+				clearerr(_sl.fh);
+#else
 				rewind(_sl.fh);
+#endif
 				_sl_version = 0;
 				_sl_minor_version = 0;
 				fmt = _saveload_formats + 1; // LZO