Some updates for muting