Index: lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java
===================================================================
diff -u -r5b1fbc89c883857eace8c043a594a79cb0f60bc4 -r9e1d6b2a7e9dd1e5f3e43d10c6c2b87365692f4a
--- lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java	(.../Subscription.java)	(revision 5b1fbc89c883857eace8c043a594a79cb0f60bc4)
+++ lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java	(.../Subscription.java)	(revision 9e1d6b2a7e9dd1e5f3e43d10c6c2b87365692f4a)
@@ -44,7 +44,7 @@
     /**
      * ID of the delivery method used to send a message for this subscription.
      */
-    @Column(name = "deliver_method_id")
+    @Column(name = "delivery_method_id")
     private Short deliveryMethodId;
 
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
diff -u -r47043f84205046a23497bf8c57060e2dcadf0c9a -r9e1d6b2a7e9dd1e5f3e43d10c6c2b87365692f4a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 47043f84205046a23497bf8c57060e2dcadf0c9a)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 9e1d6b2a7e9dd1e5f3e43d10c6c2b87365692f4a)
@@ -193,7 +193,9 @@
      * are null, then it will default to the current datetime.
      */
 
-    /** full constructor */
+    /** Full constructor. This is called by AuthoringService.insertSingleActivityLearningDesign with nulls for the 
+     * sets, so if they are null let the default initialisation (above) stand - don't overwrite the empty sets with nulls.
+     */
     public LearningDesign(Long learningDesignId, Integer ui_id, String description, String title,
 	    Activity firstActivity, FloatingActivity floatingActivity, Integer maxID, Boolean validDesign,
 	    Boolean readOnly, Date dateReadOnly, String helpText, Integer copyTypeID, Date createDateTime,
@@ -219,9 +221,12 @@
 	this.originalUser = originalUser;
 	this.originalLearningDesign = originalLearningDesign;
 	this.childLearningDesigns = childLearningDesigns;
-	this.lessons = lessons;
-	this.transitions = transitions;
-	this.activities = activities;
+	if ( lessons != null ) 
+	    this.lessons = lessons;
+	if ( transitions != null )
+	    this.transitions = transitions;
+	if ( activities  != null )
+	    this.activities = activities;
 	this.duration = duration;
 	this.licenseText = licenseText;
 	this.license = license;
@@ -242,6 +247,7 @@
 	this.editOverrideLock = false;
 	this.designVersion = 1;
 	this.removed = Boolean.FALSE;
+	this.activities = new TreeSet<Activity>(new ActivityOrderComparator());
     }
 
     /**