Fixed some issues with vCloud 0.8 support