Muting fixes