Some enchanting fixes