diff --git a/VersionNum b/VersionNum
index aabfff343781d7067b80c59dc9e5462e057e7a17..cb842854ac79028162e0e370ae739394153b9af0 100644
--- a/VersionNum
+++ b/VersionNum
@@ -4,18 +4,18 @@
  *
  */
 #define Module_MajorVersion_CMHG        0.80
-#define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                03 Aug 2019
+#define Module_MinorVersion_CMHG        FixShareability.1
+#define Module_Date_CMHG                09 Aug 2019
 
 #define Module_MajorVersion             "0.80"
 #define Module_Version                  80
-#define Module_MinorVersion             ""
-#define Module_Date                     "03 Aug 2019"
+#define Module_MinorVersion             "FixShareability.1"
+#define Module_Date                     "09 Aug 2019"
 
-#define Module_ApplicationDate          "03-Aug-19"
+#define Module_ApplicationDate          "09-Aug-19"
 
 #define Module_ComponentName            "HAL_BCM2835"
 
-#define Module_FullVersion              "0.80"
-#define Module_HelpVersion              "0.80 (03 Aug 2019)"
+#define Module_FullVersion              "0.80 (FixShareability.1)"
+#define Module_HelpVersion              "0.80 (09 Aug 2019) FixShareability.1"
 #define Module_LibraryVersionInfo       "0:80"
diff --git a/s/Top b/s/Top
index fe37641a706352c1ffd4be977e873c2acb7a1de7..eb38e01e55b46be3baebcfaf174b6635f2779794 100644
--- a/s/Top
+++ b/s/Top
@@ -37,6 +37,7 @@
         GET     Hdr:System
         GET     Hdr:Machine.<Machine>
         GET     Hdr:HALSize.<HALSize>
+        GET     Hdr:MEMM.VMSAv6
         GET     Hdr:FSNumbers
         GET     Hdr:NewErrors
         GET     Hdr:BCMSupport
@@ -708,7 +709,7 @@ HAL_Init
         BCC     %FT05
 
         ; Map in the A7/A53 control logic
-        MOV     a1, #0
+        MOV     a1, #L1_S
         LDR     a2, =QA7_BASE
         LDR     a3, =QA7_SIZE
         CallOS  OS_MapInIO
@@ -717,7 +718,8 @@ HAL_Init
         LDR     a2, =IO_Base_BCM2836
 05
         ; Map in the main IO region
-        MOV     a1, #0
+        MOVCC   a1, #0
+        MOVCS   a1, #L1_S
         LDR     a3, =IO_Size
         CallOS  OS_MapInIO
         STR     a1, PeriBase