diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 0d17c2ebca..592ba9e77d 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -187,10 +187,10 @@ public class MainApp extends Application {
             pluginsList.add(CareportalPlugin.getPlugin());
             if (Config.PUMPDRIVERS) pluginsList.add(ComboPlugin.getPlugin());
             if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin());
+            pluginsList.add(VirtualPumpPlugin.getPlugin());
             if (Config.PUMPDRIVERS && engineeringMode) {
                 pluginsList.add(MedtronicPumpPlugin.getPlugin());
             }
-            pluginsList.add(VirtualPumpPlugin.getPlugin());
             if (Config.APS) pluginsList.add(LoopPlugin.getPlugin());
             if (Config.APS) pluginsList.add(OpenAPSMAPlugin.getPlugin());
             if (Config.APS) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index 5779ecca4d..6cbf2594e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -479,7 +479,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
             }
         }
 
-        if (!oldTreatment._id.equals(newTreatment._id)) {
+        if (!StringUtils.equals(oldTreatment._id, newTreatment._id)) {
             if (StringUtils.isBlank(oldTreatment._id)) {
                 oldTreatment._id = newTreatment._id;
                 changed = true;