Fix the connector resolver to make sure known connectors are used