More fixes, more robust classes