Tiny code & i18n fixes here and there