Fixed many issues with the connectors