More fixes to get to work with sauce labs