Make minor changes to Notifier