Notification and diff fixes.