fixes for multiple flight events like f3b