more notifier fixes