Fixed more path issues with Windows...