Redo fix for Windows path resolve