Change the handling of circular buffers to not waste 4 bytes