Bug fixes to spell damage support