Fixes on translation merging