a few fixes to make bilingual stuff a bit better