Event Notification fixes.