notice fixes
Merge pull request #3002 from kurund/error-fixes

notice fixes