[WiP] Vagrant fixup