more fixes to support the VM build