Notifications improvements and fixes