diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModel.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModel.java
index ff2d97040..6aa11f71c 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModel.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModel.java
@@ -82,7 +82,11 @@ class ItemPhaseTableModel implements TableModel {
             case 1:
                 return currentRow.getDescription();
             case 2:
-                return format.format(currentRow.getStartDate());
+                if (currentRow.getStartDate() == null) {
+                    return "";
+                } else {
+                    return format.format(currentRow.getStartDate());
+                }
             case 3:
                 if (currentRow.getEndDate() == null) {
                     return new GlobalizedMessage("cms.ui.lifecycle.forever",
diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableRow.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableRow.java
index fd710a3f4..8a56b9700 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableRow.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableRow.java
@@ -28,7 +28,7 @@ import java.util.Date;
 class ItemPhaseTableRow implements Serializable {
 
     private static final long serialVersionUID = -8947185134493863779L;
-    
+
     private long phaseId;
     private String name;
     private String description;
@@ -60,21 +60,35 @@ class ItemPhaseTableRow implements Serializable {
     }
 
     public Date getStartDate() {
-        return new Date(startDate.getTime());
+        if (startDate == null) {
+            return null;
+        } else {
+            return new Date(startDate.getTime());
+        }
     }
 
     public void setStartDate(final Date startDate) {
-        this.startDate = new Date(startDate.getTime());
+        if (startDate == null) {
+            this.startDate = startDate;
+        } else {
+            this.startDate = new Date(startDate.getTime());
+        }
     }
 
     public Date getEndDate() {
-        return new Date(endDate.getTime());
+        if (endDate == null) {
+            return null;
+        } else {
+            return new Date(endDate.getTime());
+        }
     }
 
     public void setEndDate(final Date endDate) {
-        this.endDate = new Date(endDate.getTime());
+        if (endDate == null) {
+            this.endDate = endDate;
+        } else {
+            this.endDate = new Date(endDate.getTime());
+        }
     }
-    
-    
-    
+
 }
diff --git a/ccm-cms/src/main/java/org/librecms/lifecycle/Phase.java b/ccm-cms/src/main/java/org/librecms/lifecycle/Phase.java
index a312cdfdf..dc4daa7cf 100644
--- a/ccm-cms/src/main/java/org/librecms/lifecycle/Phase.java
+++ b/ccm-cms/src/main/java/org/librecms/lifecycle/Phase.java
@@ -85,19 +85,35 @@ public class Phase implements Serializable {
     }
 
     public Date getStartDateTime() {
-        return new Date(startDateTime.getTime());
+        if (startDateTime == null) {
+            return null;
+        } else {
+            return new Date(startDateTime.getTime());
+        }
     }
 
     public void setStartDateTime(final Date startDateTime) {
-        this.startDateTime = new Date(startDateTime.getTime());
+        if (startDateTime == null) {
+            this.startDateTime = startDateTime;
+        } else {
+            this.startDateTime = new Date(startDateTime.getTime());
+        }
     }
 
     public Date getEndDateTime() {
-        return new Date(endDateTime.getTime());
+        if (endDateTime == null) {
+            return null;
+        } else {
+            return new Date(endDateTime.getTime());
+        }
     }
 
     public void setEndDateTime(final Date endDateTime) {
-        this.endDateTime = new Date(endDateTime.getTime());
+        if (endDateTime == null) {
+            this.endDateTime = endDateTime;
+        } else {
+            this.endDateTime = new Date(endDateTime.getTime());
+        }
     }
 
     public String getListener() {
@@ -202,7 +218,7 @@ public class Phase implements Serializable {
     public final String toString() {
         return toString("");
     }
-    
+
     public String toString(final String data) {
         return String.format("%s{ "
                                  + "phaseId = %d, "
diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_1__fix_content_types_constraints.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_1__fix_content_types_constraints.sql
index 1f9798ba6..beca8e1d2 100644
--- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_1__fix_content_types_constraints.sql
+++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_1__fix_content_types_constraints.sql
@@ -12,4 +12,4 @@ alter table CCM_CMS.CONTENT_TYPES
 alter table CCM_CMS.CONTENT_TYPES 
     add constraint FKhnu9oikw8rpf22lt5fmk41t7k 
     foreign key (DEFAULT_WORKFLOW) 
-    references CCM_CORE.WORKFLOW_TEMPLATES;
+    references CCM_CORE.WORKFLOWS;
diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_4__add_section_lifecycle_workflow.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_4__add_section_lifecycle_workflow.sql
index b4592c9de..cb1592481 100644
--- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_4__add_section_lifecycle_workflow.sql
+++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_4__add_section_lifecycle_workflow.sql
@@ -27,7 +27,7 @@ alter table CCM_CMS.CONTENT_SECTION_LIFECYCLE_DEFINITIONS
 alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES 
     add constraint FKrx08cdjm9tutrp5lvfhgslw48 
     foreign key (WORKFLOW_TEMPLATE_ID) 
-    references CCM_CORE.WORKFLOW_TEMPLATES;
+    references CCM_CORE.WORKFLOWS;
 
 alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES 
     add constraint FK6kuejkcl9hcbkr8q6bdlatt8q 
diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_1__fix_content_types_constraints.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_1__fix_content_types_constraints.sql
index de4e04d5e..f7c9ed99f 100644
--- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_1__fix_content_types_constraints.sql
+++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_1__fix_content_types_constraints.sql
@@ -12,5 +12,5 @@ alter table CCM_CMS.CONTENT_TYPES
 alter table CCM_CMS.CONTENT_TYPES 
     add constraint FKhnu9oikw8rpf22lt5fmk41t7k 
     foreign key (DEFAULT_WORKFLOW) 
-    references CCM_CORE.WORKFLOW_TEMPLATES;
+    references CCM_CORE.WORKFLOWS;
 
diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_4__add_section_lifecycle_workflow.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_4__add_section_lifecycle_workflow.sql
index 83255d861..9956ae671 100644
--- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_4__add_section_lifecycle_workflow.sql
+++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_4__add_section_lifecycle_workflow.sql
@@ -27,7 +27,7 @@ alter table CCM_CMS.CONTENT_SECTION_LIFECYCLE_DEFINITIONS
 alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES 
     add constraint FKrx08cdjm9tutrp5lvfhgslw48 
     foreign key (WORKFLOW_TEMPLATE_ID) 
-    references CCM_CORE.WORKFLOW_TEMPLATES;
+    references CCM_CORE.WORKFLOWS;
 
 alter table CCM_CMS.CONTENT_SECTION_WORKFLOW_TEMPLATES 
     add constraint FK6kuejkcl9hcbkr8q6bdlatt8q