some fixes in bdd