Various smaller regression fixes caused by multistream rewrite