Some Other fixes on language