diff --git a/src/main/java/xyz/ineanto/nicko/appearance/random/RandomNameFetcher.java b/src/main/java/xyz/ineanto/nicko/appearance/random/RandomNameFetcher.java
index a11f477..c390f4a 100644
--- a/src/main/java/xyz/ineanto/nicko/appearance/random/RandomNameFetcher.java
+++ b/src/main/java/xyz/ineanto/nicko/appearance/random/RandomNameFetcher.java
@@ -27,7 +27,7 @@ public class RandomNameFetcher {
                 final String[] values = line.split("\n");
                 records.add(Arrays.asList(values));
             }
-            return records.get(new Random().nextInt(records.size() - 1)).get(0);
+            return records.get(new Random().nextInt(records.size() - 1)).getFirst();
         } catch (IOException e) {
             instance.getLogger().severe("Unable to fetch random names.");
             return "Ineanto";
diff --git a/src/main/java/xyz/ineanto/nicko/i18n/I18N.java b/src/main/java/xyz/ineanto/nicko/i18n/I18N.java
index 3cb0f7e..df2f440 100644
--- a/src/main/java/xyz/ineanto/nicko/i18n/I18N.java
+++ b/src/main/java/xyz/ineanto/nicko/i18n/I18N.java
@@ -106,10 +106,10 @@ public class I18N {
             return new Translation(null, toTranslate);
         } else if (name != null && (lore == null || lore.isEmpty())) {
             // Valid name, empty lore
-            return new Translation(toTranslate.get(0), new ArrayList<>(Collections.emptyList()));
+            return new Translation(toTranslate.getFirst(), new ArrayList<>(Collections.emptyList()));
         } else {
             // Valid name, valid lore
-            return new Translation(toTranslate.get(0), new ArrayList<>(toTranslate.subList(1, toTranslate.size())));
+            return new Translation(toTranslate.getFirst(), new ArrayList<>(toTranslate.subList(1, toTranslate.size())));
         }
     }
 
diff --git a/src/main/java/xyz/ineanto/nicko/migration/CustomLocaleMigrator.java b/src/main/java/xyz/ineanto/nicko/migration/CustomLocaleMigrator.java
index 54279ea..35f12ee 100644
--- a/src/main/java/xyz/ineanto/nicko/migration/CustomLocaleMigrator.java
+++ b/src/main/java/xyz/ineanto/nicko/migration/CustomLocaleMigrator.java
@@ -34,7 +34,7 @@ public class CustomLocaleMigrator implements Migrator {
             try {
                 Files.copy(customLocale.getFile().toPath(), backupFile.toPath());
                 if (customLocale.getFile().delete()) {
-                    customLocale.dumpIntoFile(Locale.ENGLISH);
+                    CustomLocale.dumpIntoFile(Locale.ENGLISH);
                 }
                 instance.getLogger().info("Successfully migrated the custom locale.");
             } catch (IOException e) {