fixes for notification entry point