diff --git a/Plan/src/main/java/com/djrapitops/plan/Permissions.java b/Plan/src/main/java/com/djrapitops/plan/Permissions.java
index 448d88572..1f38dfcd8 100644
--- a/Plan/src/main/java/com/djrapitops/plan/Permissions.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Permissions.java
@@ -43,9 +43,7 @@ public enum Permissions {
     }
 
     /**
-     * Returns the permission node in plugin.yml.
-     * <p>
-     * Same as getPermission.
+     * Same as {@link #getPermission()}.
      *
      * @return permission node eg. plan.inspect
      */
diff --git a/Plan/src/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/com/djrapitops/plan/Plan.java
index 62a9aa8bf..7da45aa3a 100644
--- a/Plan/src/main/java/com/djrapitops/plan/Plan.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java
@@ -72,7 +72,7 @@ public class Plan extends BukkitPlugin<Plan> {
     private HookHandler hookHandler; // Manages 3rd party data sources
 
     private Database db;
-    private HashSet<Database> databases;
+    private Set<Database> databases;
 
     private WebServer uiServer;
 
@@ -85,8 +85,9 @@ public class Plan extends BukkitPlugin<Plan> {
      * @return API of the current instance of Plan.
      * @throws IllegalStateException If onEnable method has not been called on
      *                               Plan and the instance is null.
+     * @throws NoClassDefFoundError  If Plan is not installed.
      */
-    public static API getPlanAPI() throws IllegalStateException {
+    public static API getPlanAPI() throws IllegalStateException, NoClassDefFoundError {
         Plan instance = getInstance();
         if (instance == null) {
             throw new IllegalStateException("Plugin not enabled properly, Singleton instance is null.");
@@ -110,7 +111,7 @@ public class Plan extends BukkitPlugin<Plan> {
      */
     @Override
     public void onEnable() {
-        // Sets the Required variables for RslPlugin instance to function correctly
+        // Sets the Required variables for BukkitPlugin instance to function correctly
         setInstance(this);
         super.setDebugMode(Settings.DEBUG.toString());
         super.setColorScheme(new ColorScheme(Phrase.COLOR_MAIN.color(), Phrase.COLOR_SEC.color(), Phrase.COLOR_TER.color()));
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java b/Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java
index ec9426305..05ea524e1 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java
@@ -26,7 +26,7 @@ public class DBUtils {
         throw new IllegalStateException("Utility class");
     }
 
-    private static final int BATCH_SIZE = 2048;
+    private static final int BATCH_SIZE = 10192;
 
     /**
      * Splits a collection of objects into lists with the size defined by