New exceptions; some fixes