Fixed unicode issues