Small changes to notice messages