fix notification processing issues