Minor changes to wbi.