Fixes + clean-up
Rev'ing BP commit + minor clean-up