diff --git a/src/blackmisc/datastore.cpp b/src/blackmisc/datastore.cpp
index 7ab585df8..2d9b0c745 100644
--- a/src/blackmisc/datastore.cpp
+++ b/src/blackmisc/datastore.cpp
@@ -46,8 +46,7 @@ namespace BlackMisc
     QJsonValue IDatastoreObjectWithIntegerKey::getDbKeyAsJsonValue() const
     {
         if (this->hasValidDbKey()) { return QJsonValue(this->m_dbKey); }
-        static const QJsonValue null;
-        return null;
+        return QJsonValue();
     }
 
     void IDatastoreObjectWithIntegerKey::setKeyAndTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix)
diff --git a/src/blackmisc/datastoreutility.cpp b/src/blackmisc/datastoreutility.cpp
index c758aa6dc..6bb6e4f8b 100644
--- a/src/blackmisc/datastoreutility.cpp
+++ b/src/blackmisc/datastoreutility.cpp
@@ -13,6 +13,7 @@
 #include "blackmisc/stringutils.h"
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <QTimeZone>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
@@ -56,6 +57,7 @@ namespace BlackMisc
         {
             QString ts(timestamp.trimmed().remove(' ').remove('-').remove(':')); // normalize
             QDateTime dt = QDateTime::fromString(ts, "yyyyMMddHHmmss");
+            dt.setTimeZone(QTimeZone::utc());
             return dt;
         }
         else