Fix up announcement controller