Some enchant tweaks