Fixing alerts