Improve notification ordering

Fixes #1, #2