More notables work

Fixes #lol-we-don't-have-any-open-issues
Actually fixes #792