Fixed Buf errors