language-specfic fixes