More fixes to stabilize the suite