more buf fixes