Fix for vagrant bug
Minor additions and fixes