Fix entities.