Notifications fixes