Fix notices
Merge pull request #187 from VitSalis/fix_notices

Fix notices