Bug fixes

Notification bug