i18n: Improvements to allow better functioning on more servers