fixed some notification issues