Minor changes to support ESXi 6.x distros.