Minor changes for adapting the Connector to trunk version