Fixes for unicode errors