Fixed a few things so they work on unicode