Fixed the core buffers.