Cross-lingual related fixes.