bravo: more fixes