Some changes from brach radio_fixes