Improved character escaping in CLI based connectors.