More fixes for sauce labs