Fixed some notification problem for cross provider notifications