small patches to better support Vagrant testing