Ok. Really fix unicode bugs