Buf Fixes