Fix issues in Apology notes