aap CAutomobile fixes