Buffer size tweaks