strict warning fixes
Merge pull request #2293 from kurund/notice-fixes

strict warning fixes