Fixes for vagrant deployment