fixes required by changes in thx.stream