Adjust to bipbip 0.5.0

@ppp0 please review