More buffer tinkering