diff --git a/VersionASM b/VersionASM
index 67fe72bd3940d4d608e6b39842a1cfa353714a9c..cf13d1f50872f3c44e7464534ef4ca9e667f3794 100644
--- a/VersionASM
+++ b/VersionASM
@@ -9,12 +9,12 @@
                         GBLS    Module_ApplicationDate
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
-Module_MajorVersion     SETS    "6.03"
-Module_Version          SETA    603
+Module_MajorVersion     SETS    "6.04"
+Module_Version          SETA    604
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "27 Jul 2019"
-Module_ApplicationDate  SETS    "27-Jul-19"
+Module_Date             SETS    "22 Apr 2020"
+Module_ApplicationDate  SETS    "22-Apr-20"
 Module_ComponentName    SETS    "RISC_OSLib"
-Module_FullVersion      SETS    "6.03"
-Module_HelpVersion      SETS    "6.03 (27 Jul 2019)"
+Module_FullVersion      SETS    "6.04"
+Module_HelpVersion      SETS    "6.04 (22 Apr 2020)"
                         END
diff --git a/VersionNum b/VersionNum
index dead4cdc7b3c683ac96500ea43e84e7ee695f9bf..2fb91f05aad8ba134ddfae3caab387299722fc1a 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,21 +1,21 @@
-/* (6.03)
+/* (6.04)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        6.03
-#define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                27 Jul 2019
+#define Module_MajorVersion_CMHG        6.04
+#define Module_MinorVersion_CMHG
+#define Module_Date_CMHG                22 Apr 2020
 
-#define Module_MajorVersion             "6.03"
-#define Module_Version                  603
+#define Module_MajorVersion             "6.04"
+#define Module_Version                  604
 #define Module_MinorVersion             ""
-#define Module_Date                     "27 Jul 2019"
+#define Module_Date                     "22 Apr 2020"
 
-#define Module_ApplicationDate          "27-Jul-19"
+#define Module_ApplicationDate          "22-Apr-20"
 
 #define Module_ComponentName            "RISC_OSLib"
 
-#define Module_FullVersion              "6.03"
-#define Module_HelpVersion              "6.03 (27 Jul 2019)"
-#define Module_LibraryVersionInfo       "6:3"
+#define Module_FullVersion              "6.04"
+#define Module_HelpVersion              "6.04 (22 Apr 2020)"
+#define Module_LibraryVersionInfo       "6:4"
diff --git a/rlib/c/drawfobj b/rlib/c/drawfobj
index 615f66084f7f502245027a327680385b72bd6406..94b1c99caa8b9611659e124c64ae7c7d772c004e 100644
--- a/rlib/c/drawfobj
+++ b/rlib/c/drawfobj
@@ -154,7 +154,7 @@ static void dr_setBox(draw_redrawstr *r, double scalefactor,
 
 static int dr_setScreenState(void)
 {
-  int VDUstatus;           /* VDU status: only the VDU5 setting matters */
+  int VDUstatus, dummy;    /* VDU status: only the VDU5 setting matters */
   int dx = wimpt_dx(), dy = wimpt_dy();
   int xeig = 0, yeig = 0;
 
@@ -178,7 +178,7 @@ static int dr_setScreenState(void)
   }
 
   /* Get VDU status */
-  os_byte(117, &VDUstatus, 0);
+  os_byte(117, &VDUstatus, &dummy);
 
   /* Set to VDU5 mode */
   bbc_vdu(5);