Minor cleanup
Add retries when switching to flight mode due to issues with the MAX-7 (thanks to M0UPU for the tip)