Fixing some unicode bugs