VM Ware plugin integration fixes