Further fixes and fallbacks for vagrant