Fixed a couple of bugs in the Notifications api