Initial changes for notification fix.