bazaar fixes