more bpc fixes