Some enchanter fixes.