fixes #2491, fixes #2487 - i18n issues