More vCloud 0.8 fixes