More fixes to language prepending