Fixes to BP