Add stream transfer metrics and some fixes