Small improvements on notification subsystem.