Some updates to notifications