Minor adjustments for BMM generation