Handle minimum_chunk_size adding a bit more flexibly