wb_bfm fixes