Minor changes in cloud stuff
Merge pull request #1043 from jkrocil/fix-cloud-stuff

Minor changes in cloud stuff