Make buffers work