Making changes to support compiling on unicode