More vagrant/docker fixes