Fix unicode

Fixed some str<->unicode conversion holes