Mostly, tracking zproto's changes