Fixing up minor issues for Cloud launch.