Update to work with the new chck's buffer changes