fixes for notification service