Fixed more language related stuff