Fixed a couple more unicode issues