Notifications fixed