[Late night work:] Fixed some more spells