Fix processing and upload