bugfixes in drive mode