[[ refactor-syntax_unicode merging ]] Errors on Windows fixed