Revert "Vehicle fixes - mainly configs"

This reverts commit 49784b13d1bbed4ddd13352f217b4b9e4da00f00.
Revert "Revert "Vehicle fixes - mainly configs""

This reverts commit 387539f763fc3e563c2db8bee743cdacb2eee5ee.