More buffer tweaks.