Spirit fixes

Acererak and Dahlver-Nar