diff --git a/mcmmo-api/src/main/java/com/gmail/nossr50/mcmmo/api/platform/PlatformProvider.java b/mcmmo-api/src/main/java/com/gmail/nossr50/mcmmo/api/platform/PlatformProvider.java
index 7f3750300..fce9f7911 100644
--- a/mcmmo-api/src/main/java/com/gmail/nossr50/mcmmo/api/platform/PlatformProvider.java
+++ b/mcmmo-api/src/main/java/com/gmail/nossr50/mcmmo/api/platform/PlatformProvider.java
@@ -13,7 +13,7 @@ import co.aikar.commands.CommandIssuer;
 import co.aikar.commands.CommandManager;
 import co.aikar.commands.CommandOperationContext;
 
-public interface PlatformProvider {
+public interface PlatformProvider<E> {
 
     Logger getLogger();
 
@@ -57,6 +57,9 @@ public interface PlatformProvider {
     @Deprecated
     MMOEntity<?> getEntity(UUID uniqueId);
 
+    @Deprecated
+    MMOEntity<?> getEntity(E uniqueId);
+
     @Deprecated
     Object getChimaeraWing();
 }
diff --git a/mcmmo-bukkit/src/main/java/com/gmail/nossr50/mcmmo/bukkit/BukkitBootstrap.java b/mcmmo-bukkit/src/main/java/com/gmail/nossr50/mcmmo/bukkit/BukkitBootstrap.java
index a8ee730e7..9955d0d0d 100644
--- a/mcmmo-bukkit/src/main/java/com/gmail/nossr50/mcmmo/bukkit/BukkitBootstrap.java
+++ b/mcmmo-bukkit/src/main/java/com/gmail/nossr50/mcmmo/bukkit/BukkitBootstrap.java
@@ -41,7 +41,7 @@ import java.util.logging.Logger;
 import co.aikar.commands.CommandManager;
 import co.aikar.commands.PaperCommandManager;
 
-public class BukkitBootstrap extends JavaPlugin implements PlatformProvider {
+public class BukkitBootstrap extends JavaPlugin implements PlatformProvider<Entity> {
 
     private mcMMO core = new mcMMO(this);
     private final BukkitPlatformScheduler scheduler = new BukkitPlatformScheduler(this);
@@ -173,7 +173,11 @@ public class BukkitBootstrap extends JavaPlugin implements PlatformProvider {
     @Override
     @Deprecated // TODO: This needs proper registration...
     public MMOEntity<?> getEntity(UUID uniqueId) {
-        final Entity entity = Bukkit.getEntity(uniqueId);
+        return getEntity(Bukkit.getEntity(uniqueId));
+    }
+
+    @Override
+    public MMOEntity<?> getEntity(Entity entity) {
         if (entity instanceof Player) {
             core.getUserManager().getPlayer((Player) entity);
         } else if (entity instanceof LivingEntity) {
@@ -234,6 +238,12 @@ public class BukkitBootstrap extends JavaPlugin implements PlatformProvider {
         pluginManager.registerEvents(new WorldListener(core), this);
     }
 
+
+    @Override
+    public void onLoad() {
+        core.onLoad();
+    }
+
     @Override
     public void onEnable() {
         core.onEnable();
diff --git a/mcmmo-core/src/main/java/com/gmail/nossr50/mcMMO.java b/mcmmo-core/src/main/java/com/gmail/nossr50/mcMMO.java
index baa2368f9..14f6adb87 100644
--- a/mcmmo-core/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/mcmmo-core/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -46,6 +46,8 @@ import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.worldguard.WorldGuardManager;
 import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import net.shatteredlands.shatt.backup.ZipLibrary;
+
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
@@ -276,12 +278,10 @@ public class mcMMO implements McMMOApi {
 
     public void onLoad()
     {
-        platformProvider.onLoad();
         worldGuardUtils = new WorldGuardUtils(this); //Init WGU
 
         // TODO: 2.2 - MIGRATE
-        /*
-        if(getServer().getPluginManager().getPlugin("WorldGuard") != null) {
+        if(Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") != null) {
 
             if(worldGuardUtils.isWorldGuardLoaded()) {
                 //Register flags
@@ -290,7 +290,6 @@ public class mcMMO implements McMMOApi {
                 worldGuardManager.registerFlags();
             }
         }
-         */
     }
 
     /**