Fix entities loading errors