Minor changes to shared BP code.