Minor changes in cloud stuff

Needed for #1028.