Fixes for first test drive.