Better radio update behavior, small fixes