ConnectorManager - small adjustments