Unicode problems fixed