More fixes to announcements