more fixes to ext/intl