Fixes of Notifications etc.