Further work on vagrant adjustments.