Bugfixes in notifications