Cockpit fixes