Bug fixes for Car Logic