less notices and warnings
Merge pull request #102 from willtp87/7.x.fixes

less notices and warnings