fixed some exceptions that would make us fail otherwise (especially class loading)