bravo: more fixes

Change-Id: I9db884d9bd00e061743d3ce02047f2f811d8c707