More work on large object upload support