non-nls fixes and language updates