A few changes to the notifications system