More fixes for latest braid