diff --git a/VersionASM b/VersionASM
index 08beb24145a9ab98e8f24bff4f833fe9a62f6fa5..824cf1aeb7381e15b304e3f796fd9af5c79bd0d7 100644
--- a/VersionASM
+++ b/VersionASM
@@ -12,9 +12,9 @@
 Module_MajorVersion     SETS    "5.77"
 Module_Version          SETA    577
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "08 Jul 2020"
-Module_ApplicationDate  SETS    "08-Jul-20"
+Module_Date             SETS    "20 Jul 2020"
+Module_ApplicationDate  SETS    "20-Jul-20"
 Module_ComponentName    SETS    "Wimp"
 Module_FullVersion      SETS    "5.77"
-Module_HelpVersion      SETS    "5.77 (08 Jul 2020)"
+Module_HelpVersion      SETS    "5.77 (20 Jul 2020)"
                         END
diff --git a/VersionNum b/VersionNum
index a1a82b0b47e8b5c0cb0bf5f55ff15ceb9335af31..69433f998f26abde24c77605446c4b26b00cc2e9 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,17 +5,17 @@
  */
 #define Module_MajorVersion_CMHG        5.77
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                08 Jul 2020
+#define Module_Date_CMHG                20 Jul 2020
 
 #define Module_MajorVersion             "5.77"
 #define Module_Version                  577
 #define Module_MinorVersion             ""
-#define Module_Date                     "08 Jul 2020"
+#define Module_Date                     "20 Jul 2020"
 
-#define Module_ApplicationDate          "08-Jul-20"
+#define Module_ApplicationDate          "20-Jul-20"
 
 #define Module_ComponentName            "Wimp"
 
 #define Module_FullVersion              "5.77"
-#define Module_HelpVersion              "5.77 (08 Jul 2020)"
+#define Module_HelpVersion              "5.77 (20 Jul 2020)"
 #define Module_LibraryVersionInfo       "5:77"
diff --git a/s/Wimp01 b/s/Wimp01
index 7fdb155ca420c88fd33b51031cfc45468557afa5..83a7d034f40961148d095cac0856a49f47879d30 100644
--- a/s/Wimp01
+++ b/s/Wimp01
@@ -134,7 +134,7 @@ $l      SUB     $rd,$rs,#"0"
         MEND
 
         MACRO
-$label  CLI     $command
+$label  InlineCLI $command
 $label
         Push    "R0,R14"
         ADR     R0,%FT01
diff --git a/s/Wimp07 b/s/Wimp07
index 4081ed09614e7274b67863d267f1cdd5a87bceda..0e25c3f3d798de1f165baf9901015feaa1aa627f 100644
--- a/s/Wimp07
+++ b/s/Wimp07
@@ -1081,11 +1081,11 @@ Do_ErrorHandler
       [ debugtask1
         ADRL    R13,stackspace
         Debuga  task1,"Error reported to Wimp: "
-        CLI     "HostVdu"
+        InlineCLI "HostVdu"
         ADRL    R0,errorbuffer+8        ; skip saved PC & error number
         SWI     XOS_Write0
         SWI     XOS_NewLine
-        CLI     "TubeVdu"
+        InlineCLI "TubeVdu"
       ]
         ADRL    R0,errorbuffer+4        ; skip saved PC
         MOV     R1,#erf_cancelbox:OR:erf_htcancel:OR:erf_dontwait