Fixed some notification problems.