Fix Unicode support