diff --git a/apps/calendar/appinfo/database.xml b/apps/calendar/appinfo/database.xml
index 5a3ad32dc243d274ecd57629195b196452683770..f60319ad432993d81abb3124e16b26a0d3bb647d 100644
--- a/apps/calendar/appinfo/database.xml
+++ b/apps/calendar/appinfo/database.xml
@@ -43,14 +43,14 @@
    <field>
     <name>startdate</name>
     <type>timestamp</type>
-    <default>0000-00-00 00:00:00</default>
+    <default>CURRENT_TIMESTAMP</default>
     <notnull>false</notnull>
    </field>
 
    <field>
     <name>enddate</name>
     <type>timestamp</type>
-    <default>0000-00-00 00:00:00</default>
+    <default>CURRENT_TIMESTAMP</default>
     <notnull>false</notnull>
    </field>
 
@@ -72,7 +72,7 @@
 
    <field>
     <name>calendardata</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
@@ -172,7 +172,7 @@
 
    <field>
     <name>timezone</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
diff --git a/apps/contacts/appinfo/database.xml b/apps/contacts/appinfo/database.xml
index 7c8268d71f53430c61b45ab6a27d2e34df035a44..f83a04b8f4777f628e8a563044ba1c649457520e 100644
--- a/apps/contacts/appinfo/database.xml
+++ b/apps/contacts/appinfo/database.xml
@@ -49,7 +49,7 @@
 
    <field>
     <name>description</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
@@ -101,7 +101,7 @@
 
    <field>
     <name>carddata</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
diff --git a/db_structure.xml b/db_structure.xml
index 94567b4d53928c31a4ba503baf2c10d3211a88dc..992d1db41412d43097e9d15af35d02fffb8ec508 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -31,7 +31,7 @@
 
    <field>
     <name>configvalue</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>
 
@@ -335,7 +335,7 @@
 
    <field>
     <name>uri</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
@@ -362,7 +362,7 @@
    <field>
     <name>moment</name>
     <type>timestamp</type>
-    <default>0000-00-00 00:00:00</default>
+    <default>CURRENT_TIMESTAMP</default>
     <notnull>true</notnull>
    </field>
 
@@ -392,7 +392,7 @@
 
    <field>
     <name>info</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>
 
@@ -432,7 +432,7 @@
 
    <field>
     <name>configvalue</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>
 
@@ -472,7 +472,7 @@
 
    <field>
     <name>propertyvalue</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>