Assorted spell fixes

No functional change.