Small changes to cloud references
More on the cloud stuff