Change unicode string handling to work a little better