further vagrant-specific changes