fix notices
Merge pull request #1898 from dlobo/NoticeFixes

fix notices