PLA-1333 fixes for words and no_lang