Fixes for announcer state