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

notice fixes