Tweaking buffer sizes again