Fix for Windows unicode handling