Make the Makefiles more portable (to different VMs)