fix some cbuf parsing stuff
Merge commit 'f17078f7c71e7f9c03bee6d0e7d3ad11ff793b63'