diff --git a/src/engine/InterestManagement/InterestManager.java b/src/engine/InterestManagement/InterestManager.java
index bd27652f..d93c2871 100644
--- a/src/engine/InterestManagement/InterestManager.java
+++ b/src/engine/InterestManagement/InterestManager.java
@@ -533,9 +533,6 @@ public enum InterestManager implements Runnable {
 
         if(player.level < 10) {
             player.setLevel((short) 10);
-            MobLoot ml = new MobLoot(player,ItemBase.getItemBase(980066),false);
-            ml.promoteToItem(player);
-            player.getCharItemManager().addGoldToInventory(50000, true);
         }
         player.isBoxed = false;
         for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){
diff --git a/src/engine/gameManager/BuildingManager.java b/src/engine/gameManager/BuildingManager.java
index 354d4f14..2e6e19a8 100644
--- a/src/engine/gameManager/BuildingManager.java
+++ b/src/engine/gameManager/BuildingManager.java
@@ -258,7 +258,7 @@ public enum BuildingManager {
         if (building == null)
             return;
 
-            building.upgradeDateTime = LocalDateTime.now().plusMinutes(5);
+
         if (building.getUpgradeDateTime() == null) {
             Logger.error("Attempt to submit upgrade job for non-ranking building");
             return;
diff --git a/src/engine/net/client/handlers/ObjectActionMsgHandler.java b/src/engine/net/client/handlers/ObjectActionMsgHandler.java
index d6ef538e..de6a9fbf 100644
--- a/src/engine/net/client/handlers/ObjectActionMsgHandler.java
+++ b/src/engine/net/client/handlers/ObjectActionMsgHandler.java
@@ -439,8 +439,10 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             //    }
                             //    break;
                             //}
-
-                            LootManager.peddleFate(player,item);
+                                int i = 0;
+                                if(i != 0) {
+                                    LootManager.peddleFate(player, item);
+                                }
                             break;
 
                         case 30: //water bucket
diff --git a/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java b/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java
index 9c1eae12..3638c2ec 100644
--- a/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java
@@ -119,8 +119,7 @@ public class UpgradeAssetMsgHandler extends AbstractClientMsgHandler {
                 return true;
             }
 
-            //dateToUpgrade = LocalDateTime.now().plusHours(buildingToRank.getBlueprint().getRankTime(nextRank));
-            dateToUpgrade = LocalDateTime.now().plusMinutes(5);
+            dateToUpgrade = LocalDateTime.now().plusHours(buildingToRank.getBlueprint().getRankTime(nextRank));
 
             BuildingManager.setUpgradeDateTime(buildingToRank, dateToUpgrade, 0);
 
diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java
index 6efc6119..00bdfb28 100644
--- a/src/engine/objects/Mob.java
+++ b/src/engine/objects/Mob.java
@@ -1885,8 +1885,7 @@ public class Mob extends AbstractIntelligenceAgent {
                 if (!building.transferGold(-rankCost, false))
                     return;
 
-                //DateTime dateToUpgrade = DateTime.now().plusHours(Mob.getUpgradeTime(this));
-                DateTime dateToUpgrade = DateTime.now().plusMinutes(5);
+                DateTime dateToUpgrade = DateTime.now().plusHours(Mob.getUpgradeTime(this));
                 Mob.setUpgradeDateTime(this, dateToUpgrade);
 
                 // Schedule upgrade job
diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index abc99255..b3b3aed5 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -1325,8 +1325,7 @@ public class NPC extends AbstractCharacter {
                 if (!building.transferGold(-rankCost, false))
                     return;
 
-                //dateToUpgrade = DateTime.now().plusHours(this.getUpgradeTime());
-                dateToUpgrade = DateTime.now().plusMinutes(5);
+                dateToUpgrade = DateTime.now().plusHours(this.getUpgradeTime());
                 this.setUpgradeDateTime(dateToUpgrade);
 
                 // Schedule upgrade job