Small improvements

* Fixed use of the notification name constant.
* Fixed some warnings.