Minor changes for vCloud