Rev'ing BP commit + minor fix