Fixes for BP