Fixes for radio mode stuff