Bugfixes in drive mode