diff --git a/src/blackcore/datacache.cpp b/src/blackcore/datacache.cpp
index 604d7506f..5f71af7fe 100644
--- a/src/blackcore/datacache.cpp
+++ b/src/blackcore/datacache.cpp
@@ -67,7 +67,7 @@ namespace BlackCore
     {
         QMutexLocker lock(&m_mutex);
 
-        QLockFile revisionFileLock(m_revisionFileName);
+        QLockFile revisionFileLock(m_revisionFileName + ".lock");
         if (! revisionFileLock.lock())
         {
             CLogMessage(this).error("Failed to lock %1: %2") << m_revisionFileName << lockFileError(revisionFileLock);
@@ -93,7 +93,7 @@ namespace BlackCore
     {
         QMutexLocker lock(&m_mutex);
 
-        QLockFile revisionFileLock(m_revisionFileName);
+        QLockFile revisionFileLock(m_revisionFileName + ".lock");
         if (revLock && ! revisionFileLock.lock())
         {
             CLogMessage(this).error("Failed to lock %1: %2") << m_revisionFileName << lockFileError(revisionFileLock);
diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h
index 447272716..eea220580 100644
--- a/src/blackmisc/containerbase.h
+++ b/src/blackmisc/containerbase.h
@@ -141,6 +141,7 @@ namespace BlackMisc
         //! \copydoc CValueObject::convertFromJson
         void convertFromJson(const QJsonObject &json)
         {
+            derived().clear();
             QJsonArray array = json.value("containerbase").toArray();
             for (auto i = array.begin(); i != array.end(); ++i)
             {