More dodgy hacks to allow global uploading #24