Update Intl constants and other clean-up