notice fixes
Merge pull request #1540 from kurund/notices-fixes

notice fixes