fixing more notification f-ups