Bug fixes for notification.