Adjustments to buffer clearing.