Upgrade to core_text