fixes for new_wbi