Fixed more language issues