CEP-545 fix notices