Fix unicode errors - step 2