Fixed some bugs with announcements when muting forever
Clean up