fix: pull in latest bp fixes