Minor changes to buffers with functor_ck