Fix system prop escaping for Windows, close #1066, fix #1044