buffer: more fixes
6 files changed