diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql
index ce3f8170e..a51c606b3 100644
--- a/ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql
+++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql
@@ -1,5 +1,5 @@
 alter table cms_task_url_generators
-    add column content_type INTEGER;
+    add content_type INTEGER;
 
 alter table cms_task_url_generators 
     add constraint cms_tas_url_gen_con_ty_f_lz1y5 foreign key (content_type)
diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.0-6.5.1.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.0-6.5.1.sql
index d5a524d65..4820653b5 100755
--- a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.0-6.5.1.sql
+++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.0-6.5.1.sql
@@ -23,7 +23,6 @@ PROMPT Red Hat Enterprise CMS 6.5.0 -> 6.5.1 Upgrade Script (Oracle)
 @@ ../oracle-se/upgrade/6.5.0-6.5.1/drop-xml-index.sql
 
 begin
-        ctx_ddl.drop_section_group('autogroup');
         ctx_ddl.create_section_group('pathgroup', 'PATH_SECTION_GROUP');
 
 end;
diff --git a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql b/ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
index 1521cecb3..d3ede781a 100755
--- a/ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
+++ b/ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
@@ -26,13 +26,13 @@ CREATE TABLE cat_category_localizations (
     category_id integer NOT NULL
 );
 
-ALTER TABLE ONLY cat_category_localizations
+ALTER TABLE cat_category_localizations
     ADD CONSTRAINT cat_cate_localizati_id_p_ancqs PRIMARY KEY (id);
 
-ALTER TABLE ONLY cat_category_localizations
+ALTER TABLE cat_category_localizations
     ADD CONSTRAINT cat_cat_localiz_cat_id_f_ykbad FOREIGN KEY (category_id) REFERENCES cat_categories(category_id);
 
-ALTER TABLE ONLY cat_category_localizations
+ALTER TABLE cat_category_localizations
     ADD CONSTRAINT cat_cate_localizati_id_f__leq0 FOREIGN KEY (id) REFERENCES acs_objects(object_id);
 
 
diff --git a/ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql b/ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql
index b63f24632..d0ed616fc 100644
--- a/ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql
+++ b/ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql
@@ -20,11 +20,11 @@
 PROMPT APLAWS ccm-forum 6.5.0 -> 6.5.1 Upgrade Script (Oracle)
  
 
-@@ ./oracle-se/6.5.0-6.5.1/add_privileges.sql
-@@ ./oracle-se/6.5.0-6.5.1/add_groups.sql
-@@ ./oracle-se/6.5.0-6.5.1/add_thread_subscriber.sql
-@@ ./oracle-se/6.5.0-6.5.1/add_file_attachments.sql
-@@ ./oracle-se/6.5.0-6.5.1/add_forum_introduction.sql
-@@ ./oracle-se/6.5.0-6.5.1/add_image_uploads.sql
-@@ ./oracle-se/6.5.0-6.5.1/add_forum_no_category_posts.sql
-@@ ./oracle-se/6.5.0-6.5.1/add_anonymous_option.sql
+@@ oracle-se/6.5.0-6.5.1/add_privileges.sql
+@@ oracle-se/6.5.0-6.5.1/add_groups.sql
+@@ oracle-se/6.5.0-6.5.1/add_thread_subscriber.sql
+@@ oracle-se/6.5.0-6.5.1/add_file_attachments.sql
+@@ oracle-se/6.5.0-6.5.1/add_forum_introduction.sql
+@@ oracle-se/6.5.0-6.5.1/add_image_uploads.sql
+@@ oracle-se/6.5.0-6.5.1/add_forum_no_category_posts.sql
+@@ oracle-se/6.5.0-6.5.1/add_anonymous_option.sql
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateContainerGroups.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateContainerGroups.java
index d944a8639..ec9269206 100644
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateContainerGroups.java
+++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateContainerGroups.java
@@ -86,13 +86,27 @@ public class CreateContainerGroups extends Program {
 		if (workspaceGroup != null) {
 		    GroupCollection supergroups = workspaceGroup.getSupergroups();
 		    supergroups.addEqualsFilter(Group.ID, parentGroup.getID());
-		    if (supergroups.size() == 0) {
-			s_log.info("moving group for " + workspace.getTitle());
-			System.out.println("moving group for " + workspace.getTitle());
-			parentGroup.addSubgroup(workspaceGroup);
+
+            boolean isEmpty = false;
+            try {
+                supergroups.isEmpty();
+            } catch (com.redhat.persistence.metadata.MetadataException e) {
+                isEmpty = true;
+            }
+
+            if (isEmpty) { //XXX Exception thrown relating to this logic!
+                        // com.redhat.persistence.metadata.MetadataException:
+                        // com/arsdigita/kernel/Group.pdl: line 27, column 23:
+                        // Query for: com.arsdigita.kernel.Group.name failed to
+                        // return rows
+                s_log.info("moving group for " + workspace.getTitle());
+                System.out.println("moving group for " + workspace.getTitle());
+                parentGroup.addSubgroup(workspaceGroup);
 		    } else {
-			s_log.info("group for " + workspace.getTitle() + " is already child of workspace type group");
-			System.out.println("group for " + workspace.getTitle() + " is already child of workspace type group");
+			    s_log.info("group for " + workspace.getTitle()
+                          +" is already child of workspace type group");
+			    System.out.println("group for " + workspace.getTitle()
+                                  +" is already child of workspace type group");
 		    }
 		} else {
 		    s_log.info("can't find group for " + workspace.getTitle());
diff --git a/ccm-ldn-terms/sql/ccm-ldn-terms/oracle-se/upgrade/6.5.1-6.5.2/change-unique_id-to-varchar.sql b/ccm-ldn-terms/sql/ccm-ldn-terms/oracle-se/upgrade/6.5.1-6.5.2/change-unique_id-to-varchar.sql
index 8a0222244..238d74f43 100644
--- a/ccm-ldn-terms/sql/ccm-ldn-terms/oracle-se/upgrade/6.5.1-6.5.2/change-unique_id-to-varchar.sql
+++ b/ccm-ldn-terms/sql/ccm-ldn-terms/oracle-se/upgrade/6.5.1-6.5.2/change-unique_id-to-varchar.sql
@@ -2,6 +2,6 @@ alter table trm_terms add (unique_id_string varchar(128) default 'UNKNOWN' not n
 alter table trm_terms rename column unique_id to unique_id_old;
 alter table trm_terms rename column unique_id_string to unique_id;
 update trm_terms set unique_id = unique_id_old;
-alter table trm_terms drop constraint trm_ter_domai_uniqu_id_u_6sito;
+alter table trm_terms drop constraint trm_ter_domai_uniqu_id_u_6sito cascade drop index; 
 alter table trm_terms add constraint trm_ter_domai_uniqu_id_u_6sito unique(domain, unique_id);
 alter table trm_terms drop column unique_id_old;