Small changes, setting upload back to synchronous