Fix issues with non-ascii strings.