Bug fixes for Car logic