A couple of other fixes
Merge branch 'next' of https://github.com/opentx/opentx into next