Some patches to make it work with Vagrant.