Fix some buffer stuff