More dodgy hacks for global uploading #24 :/