Fixed bugs with notifications.