buffer tweaks