fix a few notification issues