More vagrant wrapper script fixes (might actually work now)