bug fixes in Connector