Fix more mute issues