Fixing the notifications