diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
index 0963d9554..9051a8872 100644
--- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
@@ -411,7 +411,7 @@ public class RepairManager extends SkillManager {
                 if (enchantLevel > enchant.getKey().getMaxLevel()) {
                     enchantLevel = enchant.getKey().getMaxLevel();
 
-                    item.addEnchantment(enchant.getKey(), enchantLevel);
+                    item.addUnsafeEnchantment(enchant.getKey(), enchantLevel);
                 }
             }
 
diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
index f3b50f4c6..fc308689c 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -961,8 +961,8 @@ public final class CombatUtils {
                 EntityType type = target.getType();
 
                 if (ExperienceConfig.getInstance().hasCombatXP(type)) {
-                    if (type == EntityType.IRON_GOLEM) {
-                        if (!((IronGolem) target).isPlayerCreated()) {
+                    if (type == EntityType.IRON_GOLEM && target instanceof IronGolem ironGolem) {
+                        if (!ironGolem.isPlayerCreated()) {
                             baseXP = ExperienceConfig.getInstance().getCombatXP(type);
                         }
                     } else {