More notification bugfixes.