Fix entities TODOs