More fixes on the fake claiming in database.