diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index ee7f119fa0..52b62434ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -622,7 +622,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
             pump.lastCmdResult = commandResult;
             pump.lastConnectionAttempt = System.currentTimeMillis();
             if (commandResult.success) {
-                pump.lastSuccessfulConnection = System.currentTimeMillis();
+                pump.lastSuccessfulConnection = pump.lastConnectionAttempt;
             }
         } finally {
             if (activity != null) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d1b4a8154..35498ff6a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -771,7 +771,7 @@
     <string name="combo_no_pump_connection">No connection for %s</string>
     <string name="combo_connect_attempt_failed">Last connect attempt failed</string>
     <string name="combo_last_connection_time">%s (%s)</string>
-    <string name="combo_tbr_remaining">%d%% (%d remaining)</string>
+    <string name="combo_tbr_remaining">%d%% (%d min remaining)</string>
     <string name="combo_last_bolus">%.1f U (%.1f %s, %s)</string>
     <string name="combo_pump_state_disconnected">Pump disconnected</string>
     <string name="combo_pump_state_suspended_due_to_error">Suspended due to error</string>
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
index d6d9871a4e..c88e490105 100644
--- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
+++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
@@ -80,6 +80,7 @@ public class SetTbrCommand extends BaseCommand {
             scripter.pressCheckKey();
             scripter.waitForMenuToBeLeft(MenuType.TBR_DURATION);
         }
+        result.success = true;
     }
 
     private void enterTbrMenu() {
@@ -101,7 +102,6 @@ public class SetTbrCommand extends BaseCommand {
         log.debug("Pressing " + (increasePercentage ? "up" : "down") + " " + percentageSteps + " times");
         for (int i = 0; i < Math.abs(percentageSteps); i++) {
             scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
-            log.debug("Push #" + (i + 1));
             log.debug("Push #" + (i + 1) + "/" + Math.abs(percentageSteps));
             if (increasePercentage) scripter.pressUpKey();
             else scripter.pressDownKey();