various fixes to make it work on the vms