Fixing notices.
Ported changes from 1.5.6.x branch.
Merge pull request #1410 from Martynas-P/master

Ported PP Express' changes from 1.5.6 to 2.0