Fixed entity_translation issues