Updated for various unicode errors