Fixed up ExLanguage issues