Fix up i18n issues not ported from 3530bis