Added would-be buffer support but something is borked