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

notice fixes