notice fixes
Merge pull request #762 from kurund/notice-fixes

notice fixes