Further fixes and enhancements to vCloud