diff --git a/src/core/TimeInfo.cpp b/src/core/TimeInfo.cpp
index 5fa0576e3..477543952 100644
--- a/src/core/TimeInfo.cpp
+++ b/src/core/TimeInfo.cpp
@@ -19,6 +19,7 @@
 
 TimeInfo::TimeInfo()
 {
+    m_expires = false;
 }
 
 QDateTime TimeInfo::lastModificationTime() const
diff --git a/src/core/Uuid.cpp b/src/core/Uuid.cpp
index 3302bf2bd..5e94899e3 100644
--- a/src/core/Uuid.cpp
+++ b/src/core/Uuid.cpp
@@ -25,15 +25,6 @@ Uuid::Uuid() : m_data(length, 0)
 {
 }
 
-Uuid::Uuid(bool generate) : m_data(length, 0)
-{
-    if (generate) {
-        while (isNull()) {
-            // TODO
-        }
-    }
-}
-
 Uuid::Uuid(const QByteArray& data)
 {
     Q_ASSERT(data.size() == 16);
@@ -41,6 +32,12 @@ Uuid::Uuid(const QByteArray& data)
     m_data = data;
 }
 
+Uuid Uuid::random() {
+    QByteArray randomAray;
+    // TODO fill with random data
+    return Uuid(randomAray);
+}
+
 QString Uuid::toBase64() const
 {
     return m_data.toBase64();
diff --git a/src/core/Uuid.h b/src/core/Uuid.h
index d9714b070..b8cc531b0 100644
--- a/src/core/Uuid.h
+++ b/src/core/Uuid.h
@@ -25,8 +25,8 @@ class Uuid
 {
 public:
     Uuid();
-    explicit Uuid(bool generate);
     explicit Uuid(const QByteArray& data);
+    static Uuid random();
     QString toBase64() const;
     QByteArray toByteArray() const;
     bool isNull() const;