diff --git a/Data/live/InstallData.cmd b/Data/live/InstallData.cmd
index 3f3b8b0..d43f92d 100644
--- a/Data/live/InstallData.cmd
+++ b/Data/live/InstallData.cmd
@@ -9,8 +9,6 @@ sqlldr %1 control=prty
 
 sqlldr %1 control=parl
 
-sqlldr %1 control=apau
-
 sqlplus %1 @create_passwords
 
 goto :done
diff --git a/Data/uat/InstallData.cmd b/Data/uat/InstallData.cmd
index 3f3b8b0..d43f92d 100644
--- a/Data/uat/InstallData.cmd
+++ b/Data/uat/InstallData.cmd
@@ -9,8 +9,6 @@ sqlldr %1 control=prty
 
 sqlldr %1 control=parl
 
-sqlldr %1 control=apau
-
 sqlplus %1 @create_passwords
 
 goto :done
diff --git a/Schema/AssociateSchema.sql b/Schema/AssociateSchema.sql
index 4c3f77e..60d3304 100644
--- a/Schema/AssociateSchema.sql
+++ b/Schema/AssociateSchema.sql
@@ -48,7 +48,7 @@ BEGIN
   
     UPDATE flows_030100.wwv_flows w
        SET w.owner = l_schema
-     WHERE security_group_id = l_sgid;
+     WHERE security_group_id = l_sgid and id = l_flow_id;
   
 
   ELSE
diff --git a/Schema/SetSubstitution.sql b/Schema/SetSubstitution.sql
index 16823bc..f173d34 100644
--- a/Schema/SetSubstitution.sql
+++ b/Schema/SetSubstitution.sql
@@ -43,7 +43,7 @@ BEGIN
 
     UPDATE flows_030100.wwv_flows w
        SET w.substitution_value_01 = l_substitution
-     WHERE security_group_id = l_sgid;
+     WHERE security_group_id = l_sgid and id = l_flow_id;
 
     dbms_output.put_line('SetSubstitution:'||l_substitution);