Minor BBM updates