Further improvements to notification manager.