NotificationHandler fixes.