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

notice fixes