More internationalization improvements per #151