Fix unicode handling