Fixing more unicode-related issues.

This is getting really tedious really fast.