Small fixes for Notifier