Further fixes for generic setup scripts to support Vagrant