diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 85851eb1e4c..4814297ae77 100644
--- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -390,7 +390,7 @@ public class ResourceLimitManagerImpl implements ResourceLimitService, Manager{
        
        if (domainId != null) {
            sc.setParameters("domainId", domainId);
-           sc.setParameters("accountId", null);
+           sc.setParameters("accountId", (Object[])null);
        }
        
        if (resourceType != null) {
diff --git a/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java b/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java
index e61174a3ca0..e355f4ef696 100644
--- a/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java
+++ b/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java
@@ -39,6 +39,25 @@ public class DbUpgradeUtils {
     }
     
     
+    public static void dropPrimaryKeyIfExists(Connection conn, String tableName) {
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = conn.prepareStatement("ALTER TABLE " + tableName + " DROP PRIMARY KEY ");
+            pstmt.executeUpdate();
+            s_logger.debug("Primary key is dropped successfully from the table " + tableName);
+        } catch (SQLException e) {
+            // do nothing here
+        } finally {
+            try {
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+    
+    
     public static void dropTableColumnsIfExist(Connection conn, String tableName, List<String> columns) {
         PreparedStatement pstmt = null;
         try {
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java b/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java
index 3be561dbc68..e4200ba373a 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java
@@ -89,5 +89,8 @@ public class Upgrade2212to2213 implements DbUpgrade {
         }
         
         
+        // drop primary keys
+        DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud_usage.usage_load_balancer_policy");
+        DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud_usage.usage_port_forwarding");
     }
 }
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 7c21e0d99e4..ec5f93f880f 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -244,7 +244,6 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
         return true;
     }
 
-
     public AccountVO getSystemAccount() {
         if (_systemAccount == null) {
             _systemAccount = _accountDao.findById(Account.ACCOUNT_ID_SYSTEM);
diff --git a/setup/db/create-schema-premium.sql b/setup/db/create-schema-premium.sql
index 1d70fa729e4..2e58719304c 100644
--- a/setup/db/create-schema-premium.sql
+++ b/setup/db/create-schema-premium.sql
@@ -178,8 +178,7 @@ CREATE TABLE  `cloud_usage`.`usage_load_balancer_policy` (
   `account_id` bigint unsigned NOT NULL,
   `domain_id` bigint unsigned NOT NULL,
   `created` DATETIME NOT NULL,
-  `deleted` DATETIME NULL,
-  PRIMARY KEY  (`id`)
+  `deleted` DATETIME NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 ALTER TABLE `cloud_usage`.`usage_load_balancer_policy` ADD INDEX `i_usage_load_balancer_policy__account_id`(`account_id`);
@@ -210,8 +209,7 @@ CREATE TABLE  `cloud_usage`.`usage_port_forwarding` (
   `account_id` bigint unsigned NOT NULL,
   `domain_id` bigint unsigned NOT NULL,
   `created` DATETIME NOT NULL,
-  `deleted` DATETIME NULL,
-  PRIMARY KEY  (`id`)
+  `deleted` DATETIME NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 ALTER TABLE `cloud_usage`.`usage_port_forwarding` ADD INDEX `i_usage_port_forwarding__account_id`(`account_id`);