improved readability of offboard fixes
Merge branch 'offboard_fix'