Fix vcloud work to be 1.8 compat