Fix more of the enchantment checks.