Some updates to attempt robustness of data transfer protocol