Fixes for Bazaar bargain and Bison