Fix more wireless bugs