Uploader optimizations