Vehicle bug fixes