These are the actual bugfixes for the unicode problem.