cbufp: fixes from review