pre-announce fixes