some fixes for vagrant use