diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 9a514e88b3..c3800ded81 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -1415,8 +1415,8 @@ h2_sweep(struct worker *wrk, struct h2_sess *h2)
 		}
 		switch (r2->state) {
 		case H2_S_CLOSED:
-			if (!r2->scheduled)
-				h2_del_req(wrk, r2);
+			AZ(r2->scheduled);
+			h2_del_req(wrk, r2);
 			break;
 		case H2_S_CLOS_REM:
 			if (!r2->scheduled) {
diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index 0e5db7b3df..075cba1838 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -350,7 +350,7 @@ h2_ou_session(struct worker *wrk, struct h2_sess *h2,
 void
 H2_PU_Sess(struct worker *wrk, struct sess *sp, struct req *req)
 {
-	VSLb(req->vsl, SLT_Debug, "H2 Prior Knowledge Upgrade");
+	VSL(SLT_Debug, sp->vxid, "H2 Prior Knowledge Upgrade");
 	req->err_code = H2_PU_MARKER;
 	SES_SetTransport(wrk, sp, req, &HTTP2_transport);
 }
@@ -358,7 +358,7 @@ H2_PU_Sess(struct worker *wrk, struct sess *sp, struct req *req)
 void
 H2_OU_Sess(struct worker *wrk, struct sess *sp, struct req *req)
 {
-	VSLb(req->vsl, SLT_Debug, "H2 Optimistic Upgrade");
+	VSL(SLT_Debug, sp->vxid, "H2 Optimistic Upgrade");
 	req->err_code = H2_OU_MARKER;
 	SES_SetTransport(wrk, sp, req, &HTTP2_transport);
 }