Fixes for Windows Unicode issues.