Making sure you've got a cleric with a number of Restorations on stand-by might not be such a bad idea either. [img]smile.gif[/img]
And as far as I know, the quarrels between Aerie and Jaheira never ends up in actual fighting or someone leaving the party... There are party combinations which result in something close to dynamite, but Jaheira/Aerie isn't one of them IIRC.