More fixes vrt languages