Tentative Windows path fix.
Merging with master.