Updated to support win64 and win32 paths