Better cross-platform path fixups

Since only windows paths need to be fixed.