Notifications improvements