Added some more UTF-16 support.