Announcer-server fixes