Minor bug fixes
buf fixes