Updated minibuf changes