bp: minor fixes