Apply error-code-salt fix to Windows too