Feature/language fixes