diff --git a/apps.json b/apps.json
index a2fd1ec9b..caf956689 100644
--- a/apps.json
+++ b/apps.json
@@ -2,7 +2,7 @@
   {
     "id": "fwupdate",
     "name": "Firmware Update",
-    "version": "0.02",
+    "version": "0.03",
     "description": "[BETA] Uploads new Espruino firmwares to Bangle.js 2. For now, please use the instructions under https://www.espruino.com/Bangle.js2#firmware-updates",
     "icon": "app.png",
     "type": "RAM",
@@ -1501,7 +1501,7 @@
   {
     "id": "gpsinfo",
     "name": "GPS Info",
-    "version": "0.07",
+    "version": "0.08",
     "description": "An application that displays information about altitude, lat/lon, satellites and time",
     "icon": "gps-info.png",
     "type": "app",
diff --git a/apps/flipper/flipper.app.js b/apps/flipper/flipper.app.js
index 2e7d3551c..7171306b1 100644
--- a/apps/flipper/flipper.app.js
+++ b/apps/flipper/flipper.app.js
@@ -12,7 +12,7 @@ function upd(th) {
   g.reset = function(n) { return g._reset().setColor(th.fg).setBgColor(th.bg); };
   g.clear = function(n) { if (n) g.reset(); return g.clearRect(0,0,g.getWidth(),g.getHeight()); };
   g.clear(1);
-};
+}
 
 function flipTheme() {
   if (!g.theme.dark) {
diff --git a/apps/flipper/flipper.icon.js b/apps/flipper/flipper.icon.js
index 16331c09e..494072c3c 100644
--- a/apps/flipper/flipper.icon.js
+++ b/apps/flipper/flipper.icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEw4X/AAO/mMUzs975K+ggLKysUAYNVqoLFitUoAKBqtQBYkJBIQABqwLEgQLEqtABggJDqkVBaoNCBZQwEgILWgoJENYsVBIcVBYpDEgpSIBYMBKQg6CuogCBY1UgoLCXAQLDqAsDBYhSBqEJHAoLDoEBcQ4LBEwILIMooLdIg4LaVoyaGERLcFao4LIdRAACYYUQBY5RKAH4Ar"));
+require("heatshrink").decompress(atob("mEw4X/AAO/mMUzs975K+ggLKysUAYNVqoLFitUoAKBqtQBYkJBIQABqwLEgQLEqtABggJDqkVBaoNCBZQwEgILWgoJENYsVBIcVBYpDEgpSIBYMBKQg6CuogCBY1UgoLCXAQLDqAsDBYhSBqEJHAoLDoEBcQ4LBEwILIMooLdIg4LaVoyaGERLcFao4LIdRAACYYUQBY5RKAH4Ar"))
diff --git a/apps/fwupdate/ChangeLog b/apps/fwupdate/ChangeLog
index 96e7e4e9b..458d695f0 100644
--- a/apps/fwupdate/ChangeLog
+++ b/apps/fwupdate/ChangeLog
@@ -2,3 +2,5 @@
 0.02: Add support for ZIPs
       Find and download ZIPs direct from the Espruino website
       Take 'beta' tag off
+0.03: Improve bootloader update safety. Now sets unsafeFlash:1 to allow flash with 2v11 and later
+      Add CRC checks for common bootloaders that we know don't work
diff --git a/apps/fwupdate/custom.html b/apps/fwupdate/custom.html
index 8c2008e54..7a1e736e4 100644
--- a/apps/fwupdate/custom.html
+++ b/apps/fwupdate/custom.html
@@ -60,6 +60,7 @@ function onInit(device) {
     document.getElementById("fw-unknown").style = "display:none";
     document.getElementById("fw-ok").style = "";
   }
+
 }
 
 function checkForFileOnServer() {
@@ -264,6 +265,8 @@ function createJS_app(binary, startAddress, endAddress) {
   bin32[3] = VERSION; // VERSION! Use this to test ourselves
   console.log("CRC 0x"+bin32[2].toString(16));
   hexJS = "";//`\x10if (E.CRC32(E.memoryArea(${startAddress},${endAddress-startAddress}))==${bin32[2]}) { print("FIRMWARE UP TO DATE!"); load();}\n`;
+  hexJS += `\x10if (E.CRC32(E.memoryArea(0xF7000,0x7000))==1339551013) { print("BOOTLOADER 2v10.219 needs update"); load();}\n`;
+  hexJS += `\x10if (E.CRC32(E.memoryArea(0xF7000,0x7000))==1207580954) { print("BOOTLOADER 2v10.236 needs update"); load();}\n`;
   hexJS += '\x10var s = require("Storage");\n';
   hexJS += '\x10s.erase(".firmware");\n';
   var CHUNKSIZE = 2048;
@@ -291,20 +294,14 @@ function createJS_bootloader(binary, startAddress, endAddress) {
     var chunk = btoa(new Uint8Array(binary.buffer, binary.byteOffset+i, l));
     hexJS += '\x10_fw.set(atob("'+chunk+'"), 0x'+(i).toString(16)+');\n';
   }
-//   hexJS += `\x10(function() {
-//   if (E.CRC32(_fw)!=${crc}) throw "Invalid CRC!";
-//   var f = require("Flash");
-//   for (var i=${startAddress};i<${endAddress};i+=4096) f.erasePage(i);
-//   f.write(_fw,${startAddress});
-//   E.reboot();
-// })();\n`;
-  hexJS += `\x10if (E.CRC32(_fw)!=${crc}) throw "Invalid CRC: 0x"+E.CRC32(_fw).toString(16);\n`;
-  hexJS += '\x10var f = require("Flash");\n';
+  hexJS += `\x10(function() { if (E.CRC32(_fw)!=${crc}) throw "Invalid CRC: 0x"+E.CRC32(_fw).toString(16);\n`;
+  hexJS += 'E.showMessage("Flashing Bootloader...")\n';
+  hexJS += 'E.setFlags({unsafeFlash:1})\n';
+  hexJS += 'var f = require("Flash");\n';
   for (var i=startAddress;i<endAddress;i+=4096)
-    hexJS += '\x10f.erasePage(0x'+i.toString(16)+');\n';
-  hexJS += `\x10f.write(_fw,${startAddress});\n`;
-  // hexJS += '\x10setTimeout(()=>E.showMessage("Rebooting..."),50);\n';
-  // hexJS += '\x10setTimeout(()=>E.reboot(), 2000);\n';
+    hexJS += 'f.erasePage(0x'+i.toString(16)+');\n';
+  hexJS += `f.write(_fw,${startAddress});\n`;
+  hexJS += `})()\n`;
 }
 
 function fileLoaded() {
diff --git a/apps/gpsinfo/ChangeLog b/apps/gpsinfo/ChangeLog
index a3a2fc89a..8d428ce85 100644
--- a/apps/gpsinfo/ChangeLog
+++ b/apps/gpsinfo/ChangeLog
@@ -4,3 +4,4 @@
 0.05: Refactor to use 'layout' library for multi-device support
 0.06: Add number of satellites in view and fix crash with GPS time
 0.07: Resolve one FIFO_FULL case and exit App with button press
+0.08: Leave GPS power switched on on exit (will switch off after 0.5 seconds anyway)
diff --git a/apps/gpsinfo/gps-info.js b/apps/gpsinfo/gps-info.js
index 467d12a95..fdac3d403 100644
--- a/apps/gpsinfo/gps-info.js
+++ b/apps/gpsinfo/gps-info.js
@@ -132,9 +132,6 @@ Bangle.on('GPS', onGPS);
 Bangle.on('GPS-raw', onGPSraw);
 
 function  exitApp() {
-  Bangle.setGPSPower(0, "app");
-  Bangle.removeListener('GPS-raw', onGPSraw);
-  Bangle.removeListener('GPS', onGPS);
   load();
 }