Change the way we work on changing number and size of buffers to be more performant.
Add more robustness for concurrent changes.