Few minor changes to the notifiations...