More changes due to Graph Resolver moving to BridgeDB