Fix up some edge case buffering regression