Update with new borrowck fixes