I mean... Just have NPC's avoid AoE's would do wonders.
Would help in all cases where random non-combat NPC's (Whom are not bound by turn based timer and can run around freely while you do combat) can and often do run directly into spells that kill them, or at the very least turn everyone hostile.
In addition, it could also help allied NPC's in the fight not go suicide into their own AoE's *Cough*Kagha*Cough*
NPC's should also end concentration on spells when combat ends (For the player isn't slightly more complicated as there are times where you might want to keep it up, such as if you've only aggro'd a portion of an upcoming fight and will be continuing to engage afterwards)