Fixed some issues when testing in the car