ext/intl further fixes