diff --git a/src/internal/m365/collection/drive/collection.go b/src/internal/m365/collection/drive/collection.go
index 594c93bbf..8c8efd86d 100644
--- a/src/internal/m365/collection/drive/collection.go
+++ b/src/internal/m365/collection/drive/collection.go
@@ -476,7 +476,7 @@ func (oc *Collection) streamItems(ctx context.Context, errs *fault.Bus) {
 		int64(len(oc.driveItems)))
 	defer close(folderProgress)
 
-	semaphoreCh := make(chan struct{}, graph.Parallelism(path.OneDriveService).Item())
+	semaphoreCh := make(chan struct{}, 1)
 	defer close(semaphoreCh)
 
 	ctx = clues.Add(ctx,
diff --git a/src/pkg/services/m365/api/graph/logging.go b/src/pkg/services/m365/api/graph/logging.go
index 0832cd744..afe20c216 100644
--- a/src/pkg/services/m365/api/graph/logging.go
+++ b/src/pkg/services/m365/api/graph/logging.go
@@ -93,5 +93,10 @@ func getRequestDump(ctx context.Context, req *http.Request, getBody bool) string
 		logger.CtxErr(ctx, err).Error("dumping http request")
 	}
 
+	// Dump all headers
+	for k, v := range req.Header {
+		logger.Ctx(ctx).Debugf("Header field %q, Value %q\n", k, v)
+	}
+
 	return string(reqDump)
 }
diff --git a/src/pkg/services/m365/api/graph/middleware.go b/src/pkg/services/m365/api/graph/middleware.go
index 8be93be1f..d1917367c 100644
--- a/src/pkg/services/m365/api/graph/middleware.go
+++ b/src/pkg/services/m365/api/graph/middleware.go
@@ -118,7 +118,6 @@ func (mw *LoggingMiddleware) Intercept(
 	middlewareIndex int,
 	req *http.Request,
 ) (*http.Response, error) {
-	logReq(req.Context(), req)
 
 	// call the next middleware
 	resp, err := pipeline.Next(req, middlewareIndex)
@@ -126,16 +125,16 @@ func (mw *LoggingMiddleware) Intercept(
 		return resp, err
 	}
 
-	ctx := clues.Add(
-		req.Context(),
-		"method", req.Method,
-		"url", LoggableURL(req.URL.String()),
-		"request_content_len", req.ContentLength,
-		"resp_status", resp.Status,
-		"resp_status_code", resp.StatusCode,
-		"resp_content_len", resp.ContentLength)
+	// ctx := clues.Add(
+	// 	req.Context(),
+	// 	"method", req.Method,
+	// 	"url", LoggableURL(req.URL.String()),
+	// 	"request_content_len", req.ContentLength,
+	// 	"resp_status", resp.Status,
+	// 	"resp_status_code", resp.StatusCode,
+	// 	"resp_content_len", resp.ContentLength)
 
-	logResp(ctx, resp)
+	//logResp(ctx, resp)
 
 	return resp, err
 }
@@ -336,6 +335,8 @@ func (mw *MetricsMiddleware) Intercept(
 	middlewareIndex int,
 	req *http.Request,
 ) (*http.Response, error) {
+	logReq(req.Context(), req)
+
 	var (
 		start     = time.Now()
 		resp, err = pipeline.Next(req, middlewareIndex)
@@ -370,5 +371,16 @@ func (mw *MetricsMiddleware) Intercept(
 
 	events.IncN(xmrui, events.APICall, xmruHeader)
 
+	ctx := clues.Add(
+		req.Context(),
+		"method", req.Method,
+		"url", LoggableURL(req.URL.String()),
+		"request_content_len", req.ContentLength,
+		"resp_status", resp.Status,
+		"resp_status_code", resp.StatusCode,
+		"resp_content_len", resp.ContentLength)
+
+	logResp(ctx, resp)
+
 	return resp, err
 }