Bug fixes for the BBW.