Bug #869: Some fixes to the previous fix
Change ActiveSpells to use ActorId