Fixes on buffer.