Fixing notification errors