PROTON-686, PROTON-???: Fix recent changes to work on windows