Fix sequence of uploads, use the state machine for uploads, even when already synched