GEP-19 Notice fixes
Merge pull request #34 from Edzelopez/GEP-19

GEP-19 Notice fixes