More fixes for Windows paths.