[#58683852] Fix notices
Merge pull request #67 from dbehrman/notices_2x

[#58683852] Fix notices