diff --git a/hal-core/src/se/hal/EventControllerManager.java b/hal-core/src/se/hal/EventControllerManager.java
index c76fd297..64fde5ec 100644
--- a/hal-core/src/se/hal/EventControllerManager.java
+++ b/hal-core/src/se/hal/EventControllerManager.java
@@ -26,7 +26,7 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
 
     /** List of all registered events **/
     private List<Event> registeredEvents = Collections.synchronizedList(new ArrayList<>());
-    /** List of auto detected events **/
+    /** List of auto-detected events **/
     private List<Event> detectedEvents = Collections.synchronizedList(new ArrayList<>());
 
 
@@ -42,7 +42,7 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
             logger.info("Reading in existing events.");
 
             for (Event event : Event.getLocalEvents(db)) {
-                EventControllerManager.getInstance().register(event);
+                register(event);
             }
         } catch (SQLException e) {
             logger.log(Level.SEVERE, "Unable to read in existing events.", e);
@@ -54,7 +54,7 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
     // ----------------------------------------------------
 
     /**
-     * Register a Event instance on the manager.
+     * Register an Event instance on the manager.
      * The manager will start to save reported data for the registered Event.
      */
     @SuppressWarnings("unchecked")
@@ -81,7 +81,7 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
     }
 
     /**
-     * Deregisters a Event from the manager.
+     * Deregister an Event from the manager.
      * Data reported on the Event will no longer be saved but already saved data will not be modified.
      * The Controller that owns the Event will be deallocated if it has no more registered devices.
      */
diff --git a/hal-core/src/se/hal/HalDatabaseUpgradeManager.java b/hal-core/src/se/hal/HalDatabaseUpgradeManager.java
index a1aace3d..e54149f7 100644
--- a/hal-core/src/se/hal/HalDatabaseUpgradeManager.java
+++ b/hal-core/src/se/hal/HalDatabaseUpgradeManager.java
@@ -110,7 +110,7 @@ public class HalDatabaseUpgradeManager {
                 // Prepare upgrade
                 // ----------------------------------------
 
-                logger.info("Starting DB upgrade from v" + mainDBVersion + " to v" + referenceDBVersion + "...");
+                logger.info("Starting DB upgrade from " + (mainDBVersion < 0 ? "scratch" : "v" + mainDBVersion) + " to v" + referenceDBVersion + "...");
 
                 final DBUpgradeHandler handler = new DBUpgradeHandler(referenceDB);
                 handler.setForcedDBUpgrade(false);
diff --git a/hal-core/src/se/hal/SensorControllerManager.java b/hal-core/src/se/hal/SensorControllerManager.java
index c4be58bb..9203318f 100644
--- a/hal-core/src/se/hal/SensorControllerManager.java
+++ b/hal-core/src/se/hal/SensorControllerManager.java
@@ -43,7 +43,7 @@ public class SensorControllerManager extends HalAbstractControllerManager<HalAbs
             logger.info("Reading in existing sensors.");
 
             for (Sensor sensor : Sensor.getLocalSensors(db)) {
-                SensorControllerManager.getInstance().register(sensor);
+                register(sensor);
             }
         } catch (SQLException e) {
             logger.log(Level.SEVERE, "Unable to read in existing sensors.", e);