diff --git a/pom.xml b/pom.xml
index f85038e..a1c469d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,10 +29,10 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.14.1-R0.1-SNAPSHOT</version>
+            <version>1.13.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java b/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java
index 91f84bb..d57e95e 100644
--- a/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java
+++ b/src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java
@@ -62,19 +62,16 @@ public class ConvertCommand implements CommandExecutor {
                 } else {
                     // Fork into background
                     sender.sendMessage(Lang.TITLE + Lang.CONVERT_BACKGROUND.toString());
-                    PlayerVaults.getInstance().getServer().getScheduler().runTaskLaterAsynchronously(PlayerVaults.getInstance(), new Runnable() {
-                        @Override
-                        public void run() {
-                            int converted = 0;
-                            VaultOperations.setLocked(true);
-                            for (Converter converter : applicableConverters) {
-                                if (converter.canConvert()) {
-                                    converted += converter.run(sender);
-                                }
+                    PlayerVaults.getInstance().getServer().getScheduler().runTaskLaterAsynchronously(PlayerVaults.getInstance(), () -> {
+                        int converted = 0;
+                        VaultOperations.setLocked(true);
+                        for (Converter converter : applicableConverters) {
+                            if (converter.canConvert()) {
+                                converted += converter.run(sender);
                             }
-                            VaultOperations.setLocked(false);
-                            sender.sendMessage(Lang.TITLE + Lang.CONVERT_COMPLETE.toString().replace("%converted", converted + ""));
                         }
+                        VaultOperations.setLocked(false);
+                        sender.sendMessage(Lang.TITLE + Lang.CONVERT_COMPLETE.toString().replace("%converted", converted + ""));
                     }, 5);
                 }
             }
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java
index 752874c..b346f7d 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/Serialization.java
@@ -127,7 +127,7 @@ public class Serialization {
                 entry.setValue(serialize((ConfigurationSerializable) entry.getValue()));
             } else if (entry.getValue() instanceof Iterable<?>) {
                 List<Object> newList = new ArrayList<>();
-                for (Object object : ((Iterable) entry.getValue())) {
+                for (Object object : ((Iterable<?>) entry.getValue())) {
                     if (object instanceof ConfigurationSerializable) {
                         object = serialize((ConfigurationSerializable) object);
                     }
@@ -167,7 +167,7 @@ public class Serialization {
             if (object instanceof Map) {
                 object = deserialize((Map<String, Object>) object);
             } else if (object instanceof List) {
-                object = convertIterable((Iterable) object);
+                object = convertIterable((Iterable<?>) object);
             } else if (object instanceof Number) {
                 object = convertNumber((Number) object);
             }
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
index 7653849..ca79b93 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
@@ -79,7 +79,7 @@ public class UUIDVaultManager {
             }
         }
         List<String> list = Serialization.toString(inventory);
-        String[] ser = list.toArray(new String[list.size()]);
+        String[] ser = list.toArray(new String[0]);
         for (int x = 0; x < ser.length; x++) {
             if (!ser[x].equalsIgnoreCase("null")) {
                 yaml.set("vault" + number + "." + x, ser[x]);
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultHolder.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultHolder.java
index d563442..8bf8e1e 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultHolder.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultHolder.java
@@ -27,7 +27,7 @@ import org.bukkit.inventory.InventoryHolder;
 public class VaultHolder implements InventoryHolder {
 
     private Inventory inventory;
-    private int vaultNumber = 0;
+    private int vaultNumber;
 
     /**
      * Creates a new vault holder
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
index 1c83269..0263638 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
@@ -220,7 +220,7 @@ public class VaultManager {
         for (String s : file.getKeys(false)) {
             try {
                 // vault%
-                int number = Integer.valueOf(s.substring(4));
+                int number = Integer.parseInt(s.substring(4));
                 vaults.add(number);
             } catch (NumberFormatException e) {
                 // silent
@@ -285,7 +285,6 @@ public class VaultManager {
         YamlConfiguration config = this.loadPlayerVaultFile(holder, false);
         if (config != null) {
             this.cachedVaultFiles.put(holder, config);
-        } else {
         }
     }