more changes for debugging connectivity in target environment