Minor fixes on notification system.