diff --git a/apps/flashcards/app.js b/apps/flashcards/app.js
index badd6b49e..5fa2e6de7 100644
--- a/apps/flashcards/app.js
+++ b/apps/flashcards/app.js
@@ -161,6 +161,15 @@ function handleDrag(event) {
   }
 }
 
+// Ensure pressing the button goes to the launcher (by making this seem like a clock?)
+Bangle.setUI({mode:"clock"/*, remove:function() {
+  // Code to enable fast load. NOTE: this doesn't work on this app because all
+  // functions and vars are declared global: https://www.espruino.com/Bangle.js+Fast+Load
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = undefined;
+  Bangle.removeListener("touch", handleTouch);
+  if (settings.swipeGesture) { Bangle.removeListener("drag", handleDrag);} else { Bangle.removeListener("stroke", handleStroke); }  
+}*/});
 
 // initialize
 cardLayout.update();
@@ -174,10 +183,5 @@ if (settings.swipeGesture) { Bangle.on("drag", handleDrag); } else { Bangle.on("
 g.clear();
 draw();
 
-// cleanup
-Bangle.setUI({mode:"clock", remove:function() {
-  if (drawTimeout) clearTimeout(drawTimeout);
-  drawTimeout = undefined;
-  Bangle.removeListener("touch", handleTouch);
-  if (settings.swipeGesture) { Bangle.removeListener("drag", handleDrag);} else { Bangle.removeListener("stroke", handleStroke); }  
-}});
+
+
diff --git a/apps/rep/app.js b/apps/rep/app.js
index 06c8889b7..8172bc362 100644
--- a/apps/rep/app.js
+++ b/apps/rep/app.js
@@ -184,7 +184,7 @@ var _a, _b, _c;
         State.prototype.currentRepIndex = function () {
             var elapsed = this.getElapsedTotal();
             var ent;
-            for (var i = 0; ent = reps_1[i]; i++)
+            for (var i = 0; (ent = reps_1[i]); i++)
                 if (elapsed < ent.accDur)
                     return i;
             return null;