otw - Some minor changes toward supporting the OCConnector.