More fixes for the new cloud