Notifications finally fixed