Fixed announcer bugs