Notification fix + no coockies