Gaia tweaks for cloudifier