Small improvements to announcement functionality