Fix issues on Linux. Uploader still fails on Linux.