Minor ConnectorActor refactoring