Buf fixes