[f18-branch] Proposed patches for some language issues