Notifications and fixes