last batch of fixes related to problems caused by new http streaming code