feature #2097: Minor modifications to VMware driver