buffer: one bug, and other fixups

A few Buffer related fixes.