Made compatability fixes to upload class
Merge pull request #1332 from phil-lavin/bugfix-upload-compat

Made compatability fixes to upload class