notifiers fixes