Changes to get uploads on Windows working.