diff --git a/README.md b/README.md
index d9594ffa2..d5bbd5ad2 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ guide:
 7. In order to test your fresh build, replace the `86Box.exe` in your current
    86Box enviroment with your freshly built one. If you do not have a
    pre-existing 86Box environment, download the latest successful build from
-   http://ci.86box.net, and the ROM set from https://tinyurl.com/rs20191001.
+   http://ci.86box.net, and the ROM set from https://tinyurl.com/rs20191022.
 8. Enjoy using and testing the emulator! :)
 
 If you encounter issues at any step or have additional questions, please join
diff --git a/src/86box.h b/src/86box.h
index 2f03791e5..f145b9b6c 100644
--- a/src/86box.h
+++ b/src/86box.h
@@ -8,13 +8,13 @@
  *
  *		Main include file for the application.
  *
- * Version:	@(#)86box.h	1.0.27	2019/01/13
+ * Version:	@(#)86box.h	1.0.28	2019/10/22
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *		Copyright 2016-2018 Miran Grca.
- *		Copyright 2017,2018 Fred N. van Kempen.
+ *		Copyright 2016-2019 Miran Grca.
+ *		Copyright 2017-2019 Fred N. van Kempen.
  */
 #ifndef EMU_86BOX_H
 # define EMU_86BOX_H
@@ -29,8 +29,13 @@
 /* Version info. */
 #define EMU_NAME	"86Box"
 #define EMU_NAME_W	L"86Box"
+#ifdef RELEASE_BUILD
 #define EMU_VERSION	"2.00"
 #define EMU_VERSION_W	L"2.00"
+#else
+#define EMU_VERSION	"2.10"
+#define EMU_VERSION_W	L"2.10"
+#endif
 
 /* Filename and pathname info. */
 #define CONFIG_FILE	L"86box.cfg"
diff --git a/src/cdrom/cdrom_dosbox.cpp b/src/cdrom/cdrom_dosbox.cpp
index daca0e37e..95ee86e3d 100644
--- a/src/cdrom/cdrom_dosbox.cpp
+++ b/src/cdrom/cdrom_dosbox.cpp
@@ -15,15 +15,15 @@
  * **NOTE**	This code will very soon be replaced with a C variant, so
  *		no more changes will be done.
  *
- * Version:	@(#)cdrom_dosbox.cpp	1.0.11	2019/03/05
+ * Version:	@(#)cdrom_dosbox.cpp	1.0.12	2019/10/22
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
  *		The DOSBox Team, <unknown>
  *
  *		Copyright 2017-2019 Fred N. van Kempen.
- *		Copyright 2016-2018 Miran Grca.
- *		Copyright 2002-2015 The DOSBox Team.
+ *		Copyright 2016-2019 Miran Grca.
+ *		Copyright 2002-2019 The DOSBox Team.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -693,7 +693,7 @@ CDROM_Interface_Image::CueLoadSheet(const wchar_t *cuefile)
 
 		canAddTrack = true;
 	} else if (command == "INDEX") {
-		uint64_t frame, index;
+		uint64_t frame = 0ULL, index;
 		index = CueGetNumber(&line);
 		success = CueGetFrame(frame, &line);
 
diff --git a/src/win/86Box.rc b/src/win/86Box.rc
index 151d9f940..46ee0e536 100644
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -8,7 +8,7 @@
  *
  *		Application resource script for Windows.
  *
- * Version:	@(#)86Box.rc	1.0.46	2019/10/21
+ * Version:	@(#)86Box.rc	1.0.47	2019/10/22
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -224,8 +224,13 @@ FONT 9, "Segoe UI"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,129,94,71,12
     ICON            100,IDC_ABOUT_ICON,7,7,20,20
+#ifdef RELEASE_BUILD
     LTEXT           "86Box v2.00 - An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.",
                     IDC_ABOUT_ICON,54,7,146,73
+#else
+    LTEXT           "86Box v2.10 - An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.",
+                    IDC_ABOUT_ICON,54,7,146,73
+#endif
     CONTROL         "",IDC_ABOUT_ICON,"Static",SS_BLACKFRAME | SS_SUNKEN,0,
                     86,208,1
 END
@@ -974,8 +979,13 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
+#ifdef RELEASE_BUILD
  FILEVERSION 2,0,0,0
  PRODUCTVERSION 2,0,0,0
+#else
+ FILEVERSION 2,10,0,0
+ PRODUCTVERSION 2,10,0,0
+#endif
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -993,14 +1003,22 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "IRC #SoftHistory\0"
             VALUE "FileDescription", "86Box - an emulator for X86-based systems\0"
+#ifdef RELEASE_BUILD
             VALUE "FileVersion", "2.00\0"
+#else
+            VALUE "FileVersion", "2.10\0"
+#endif
             VALUE "InternalName", "86Box\0"
             VALUE "LegalCopyright", "Copyright (C)SoftHistory, Sarah Walker, 2007-2017, Released under the GNU GPL v2\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "86Box.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "86Box Emulator\0"
+#ifdef RELEASE_BUILD
             VALUE "ProductVersion", "2.00\0"
+#else
+            VALUE "ProductVersion", "2.10\0"
+#endif
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/src/win/win_sdl.c b/src/win/win_sdl.c
index d05e9fdeb..7a58fa2e6 100644
--- a/src/win/win_sdl.c
+++ b/src/win/win_sdl.c
@@ -12,7 +12,7 @@
  *		we will not use that, but, instead, use a new window which
  *		coverrs the entire desktop.
  *
- * Version:	@(#)win_sdl.c  	1.0.7	2019/10/12
+ * Version:	@(#)win_sdl.c  	1.0.8	2019/10/22
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Michael Drüing, <michael@drueing.de>
@@ -365,7 +365,7 @@ sdl_init_common(int fs)
 {
     wchar_t temp[128];
     SDL_version ver;
-    int w, h, x, y;
+    int w = 0, h = 0, x = 0, y = 0;
     RECT rect;
 
     sdl_log("SDL: init (fs=%d)\n", fs);