Another buffer tweak.