Fix buffer diffs (closes #1132, closes #1433)