Hopefully fixed issues with Unicode encodings.