Changes to compat-wireless and bluetooth