Minor adjustments/fix for vagrant