Fix directions, vehicle locations bug