Fixed the upload path
Merged the changes from Windows