i18, fixes etc