More fixes for languages