significant bug fixes for bpc