diff --git a/src/main/java/com/shynieke/statues/recipe/LootRecipe.java b/src/main/java/com/shynieke/statues/recipe/LootRecipe.java
index b798f7c9..d56134c6 100644
--- a/src/main/java/com/shynieke/statues/recipe/LootRecipe.java
+++ b/src/main/java/com/shynieke/statues/recipe/LootRecipe.java
@@ -52,7 +52,7 @@ public boolean showNotification() {
 
 	@Override
 	public boolean matches(RecipeInput recipeInput, Level level) {
-		return this.getIngredients().get(0).test(recipeInput.getItem(0));
+		return this.getIngredients().getFirst().test(recipeInput.getItem(0));
 	}
 
 	@Override
diff --git a/src/main/java/com/shynieke/statues/recipe/UpgradeType.java b/src/main/java/com/shynieke/statues/recipe/UpgradeType.java
index dc9758ff..11332579 100644
--- a/src/main/java/com/shynieke/statues/recipe/UpgradeType.java
+++ b/src/main/java/com/shynieke/statues/recipe/UpgradeType.java
@@ -138,11 +138,10 @@ public boolean apply(ItemStack stack, int level) {
 
 							String glowingID = GLOWING.name().toLowerCase(Locale.ROOT);
 							StatueUpgrades statueUpgrades = stack.getOrDefault(StatueDataComponents.UPGRADES, StatueUpgrades.empty());
-							Map<String, Short> upgradeMap = new HashMap<>();
 							short glowLevel = statueUpgrades.upgradeMap().getOrDefault(glowingID, (short) 0);
 
 							if (glowLevel > 0) {
-								upgradeMap.putAll(statueUpgrades.withDowngrade(glowingID));
+								Map<String, Short> upgradeMap = new HashMap<>(statueUpgrades.withDowngrade(glowingID));
 
 								if (upgradeMap.getOrDefault(glowingID, (short) 0) == 0)
 									upgradeMap.remove(glowingID);
diff --git a/src/main/java/com/shynieke/statues/util/ListHelper.java b/src/main/java/com/shynieke/statues/util/ListHelper.java
index ab6fdec7..86d67723 100644
--- a/src/main/java/com/shynieke/statues/util/ListHelper.java
+++ b/src/main/java/com/shynieke/statues/util/ListHelper.java
@@ -15,7 +15,7 @@ public static <T> T getRandomFromList(List<T> list) {
 	public static <T> T getRandomFromList(List<T> list, Random rand) {
 		final int size = list.size();
 		Preconditions.checkArgument(size > 0, "Can't select from empty list");
-		if (size == 1) return list.get(0);
+		if (size == 1) return list.getFirst();
 		int randomIndex = rand.nextInt(list.size());
 		return list.get(randomIndex);
 	}