Add fixes for vbrfix behaviour.