Merge pull request #2004 from dlobo/NoticeFixes