Some small updates to SRDA data collection module, while debugging an indefinite wait issue.