diff --git a/env.js b/env.js
index acb4f64e2..c8be09fb2 100644
--- a/env.js
+++ b/env.js
@@ -27,12 +27,12 @@ function config ( ) {
   } else {
     git.short(function record_git_head (head) {
       console.log("GIT HEAD", head);
-      env.head = head || readENV("SCM_COMMIT_ID", "");
+      env.head = head || readENV('SCM_COMMIT_ID') || readENV('COMMIT_HASH', '');
     });
   }
   env.version = software.version;
   env.name = software.name;
-  env.MQTT_MONITOR = process.env.MQTT_MONITOR || null;
+  env.MQTT_MONITOR = readENV('MQTT_MONITOR', null);
   env.DISPLAY_UNITS = readENV('DISPLAY_UNITS', 'mg/dl');
   env.PORT = readENV('PORT', 1337);
   env.mongo = readENV('MONGO_CONNECTION') || readENV('MONGO') || readENV('MONGOLAB_URI');
diff --git a/lib/entries.js b/lib/entries.js
index abd019897..77d5a4542 100644
--- a/lib/entries.js
+++ b/lib/entries.js
@@ -113,7 +113,8 @@ function storage(name, storage, pushover) {
           totalCreated = 0;
 
       docs.forEach(function(doc) {
-        collection.update(doc, doc, {upsert: true}, function (err, created) {
+        var query  = (doc.sysTime && doc.type) ? {sysTime: doc.sysTime, type: doc.type} : doc;
+        collection.update(query, doc, {upsert: true}, function (err, created) {
           firstErr = firstErr || err;
           if (++totalCreated === numDocs) {
             fn(firstErr, docs);
@@ -199,7 +200,7 @@ function storage(name, storage, pushover) {
   return api;
 }
 
-var indexedFields = [ 'date', 'type', 'sgv' ];
+var indexedFields = [ 'date', 'type', 'sgv', 'sysTime' ];
 storage.indexedFields = indexedFields;
 
 // expose module
diff --git a/lib/mqtt.js b/lib/mqtt.js
index b67095fe6..71e68e213 100644
--- a/lib/mqtt.js
+++ b/lib/mqtt.js
@@ -101,7 +101,7 @@ function configure(env, core, devicestatus) {
     var opts = {
         encoding: 'binary',
         clean: false,
-        clientId: env.head
+        clientId: env.mqtt_client_id
     };
     var client = mqtt.connect(uri, opts);
     var downloads = downloader();