Fixed a couple of issues with notifications