Connector, prop, accept fixes