Minor fixes for execution within the Vagrant VM

These should make the vagrant bits work from within the VM.