Fixes for latest braid