Make some progress on fixing realtime notifications.