Fix/work around Windows encoding issues (Fixes #2095)