Some fixes to notices