Fix entity creation
Image sync works again