Minor fixes to fit with SpellAuras and other