Add some buffer stuff