Bugfixes for spells
Merge branch 'pr/12'