VP : Fix BRI and experimental  BRA

Not for merge until we're good for it .