A few tweaks for the cloud