Fix entities