diff --git a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
index 2ebe9800756..e7fea237700 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java
@@ -70,7 +70,7 @@ public class Upgrade40to41 implements DbUpgrade {
 	public File[] getCleanupScripts() {
         String script = Script.findScript("", "db/schema-40to410-cleanup.sql");
         if (script == null) {
-            throw new CloudRuntimeException("Unable to find db/schema-302to40-cleanup.sql");
+            throw new CloudRuntimeException("Unable to find db/schema-40to410-cleanup.sql");
         }
 
         return new File[] { new File(script) };
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index b4f992d4287..369a075cf6f 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -145,12 +145,12 @@ DROP TABLE IF EXISTS `cloud`.`region`;
 DROP TABLE IF EXISTS `cloud`.`s2s_customer_gateway`;
 DROP TABLE IF EXISTS `cloud`.`s2s_vpn_gateway`;
 DROP TABLE IF EXISTS `cloud`.`s2s_vpn_connection`;
-DROP TABLE IF EXISTS `cloud`,`external_nicira_nvp_devices`;
-DROP TABLE IF EXISTS `cloud`,`nicira_nvp_nic_map`;
-DROP TABLE IF EXISTS `cloud`,`s3`;
-DROP TABLE IF EXISTS `cloud`,`template_s3_ref`;
-DROP TABLE IF EXISTS `cloud`,`nicira_nvp_router_map`;
-DROP TABLE IF EXISTS `cloud`,`external_bigswitch_vns_devices`;
+DROP TABLE IF EXISTS `cloud`.`external_nicira_nvp_devices`;
+DROP TABLE IF EXISTS `cloud`.`nicira_nvp_nic_map`;
+DROP TABLE IF EXISTS `cloud`.`s3`;
+DROP TABLE IF EXISTS `cloud`.`template_s3_ref`;
+DROP TABLE IF EXISTS `cloud`.`nicira_nvp_router_map`;
+DROP TABLE IF EXISTS `cloud`.`external_bigswitch_vns_devices`;
 DROP TABLE IF EXISTS `cloud`.`autoscale_vmgroup_policy_map`;
 DROP TABLE IF EXISTS `cloud`.`autoscale_policy_condition_map`;
 DROP TABLE IF EXISTS `cloud`.`autoscale_vmgroups`;