Minor changes to utility functions
Small change in CSAConnector