Small cloud tweaks