A few fixes concerning internationalization