misc fixes for notifier