Fixing some cloud bugs.