Fix BP issues