Fixed notification issues