Fix Notifications errors