More fixes to BFP.