diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 25fda295b..67f39b73a 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -30,8 +30,8 @@ Database::Database()
     m_rootGroup = 0;
 
     m_cipher = KeePass2::CIPHER_AES;
-    m_compressionAlgo = CompressionNone; // TODO change to CompressionGZip?
-    m_transformRounds = 1000; // TODO random number
+    m_compressionAlgo = CompressionGZip;
+    m_transformRounds = 50000;
 }
 
 Group* Database::rootGroup()
diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index baabcde57..17b0f5b7a 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -29,7 +29,9 @@ Entry::Entry()
     m_group = 0;
     m_db = 0;
 
-    m_iconNumber = 0; // TODO change?
+    m_iconNumber = 0;
+    m_autoTypeEnabled = true;
+    m_autoTypeObfuscation = 0;
 
     Q_FOREACH (const QString& key, m_defaultAttibutes) {
         addAttribute(key, "");
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index bea395843..c83d38e9b 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -30,7 +30,10 @@ Group::Group()
     m_db = 0;
     m_lastTopVisibleEntry = 0;
 
-    m_iconNumber = 0; // TODO change?
+    m_iconNumber = 48;
+    m_isExpanded = true;
+    m_autoTypeEnabled = Inherit;
+    m_searchingEnabled = Inherit;
 }
 
 Group::~Group()
diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index 1f1e75b0e..a766a8fb3 100644
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -22,13 +22,17 @@
 Metadata::Metadata(Database* parent)
     : QObject(parent)
 {
-    m_generator = "KeePassX";
-    m_maintenanceHistoryDays = 365;
     m_recycleBin = 0;
     m_entryTemplatesGroup = 0;
     m_lastSelectedGroup = 0;
     m_lastTopVisibleGroup = 0;
 
+    m_generator = "KeePassX";
+    m_maintenanceHistoryDays = 365;
+    m_recycleBinEnabled = true;
+    m_masterKeyChangeRec = -1;
+    m_masterKeyChangeForce = -1;
+
     QDateTime now = QDateTime::currentDateTime();
     m_nameChanged = now;
     m_descriptionChanged = now;
@@ -42,8 +46,6 @@ Metadata::Metadata(Database* parent)
     m_protectPassword = true;
     m_protectUrl = false;
     m_protectNotes = false;
-
-    // TODO initalize all members
 }
 
 QString Metadata::generator() const
diff --git a/src/core/TimeInfo.cpp b/src/core/TimeInfo.cpp
index d5bf1fb8c..c6cdcc162 100644
--- a/src/core/TimeInfo.cpp
+++ b/src/core/TimeInfo.cpp
@@ -20,7 +20,7 @@
 TimeInfo::TimeInfo()
 {
     m_expires = false;
-    m_usageCount = 0; // TODO ???
+    m_usageCount = 0;
 
     QDateTime now = QDateTime::currentDateTime();
     m_lastModificationTime = now;