Enchantment fixes and tweaks