Fixed notification bugs