diff --git a/apps/demo/pages/file-manager.tsx b/apps/demo/pages/file-manager.tsx
index 3be8ef9b..68e0cf9e 100644
--- a/apps/demo/pages/file-manager.tsx
+++ b/apps/demo/pages/file-manager.tsx
@@ -71,31 +71,6 @@ const renderDetailsHeader: IRenderFunction<IDetailsHeaderProps> = (props?, defau
     });
 };
 
-function createReadableStreamFromBufferIterator(
-    iterator: AsyncIterator<ArrayBuffer>
-): ReadableStream<Uint8Array> {
-    return new ReadableStream<Uint8Array>({
-        async pull(controller) {
-            const { desiredSize } = controller;
-            if (!desiredSize || desiredSize < 0) {
-                return;
-            }
-
-            let written = 0;
-            while (written < desiredSize) {
-                const result = await iterator.next();
-                if (result.done) {
-                    controller.close();
-                    return;
-                }
-
-                controller.enqueue(new Uint8Array(result.value));
-                written += result.value.byteLength;
-            }
-        },
-    });
-}
-
 function compareCaseInsensitively(a: string, b: string) {
     let result = a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase());
     if (result !== 0) {
@@ -583,7 +558,12 @@ const FileManager: NextPage = (): JSX.Element | null => {
     const previewImage = useCallback(async (path: string) => {
         const sync = await globalState.device!.sync();
         try {
-            const readable = await sync.read(path);
+            const readable = (await sync.read(path))
+                .pipeThrough(new TransformStream({
+                    transform(chunk, controller) {
+                        controller.enqueue(new Uint8Array(chunk));
+                    },
+                }));
             const response = new Response(readable);
             const blob = await response.blob();
             const url = window.URL.createObjectURL(blob);
diff --git a/apps/demo/pages/scrcpy.tsx b/apps/demo/pages/scrcpy.tsx
index 4249a4b5..d634f960 100644
--- a/apps/demo/pages/scrcpy.tsx
+++ b/apps/demo/pages/scrcpy.tsx
@@ -495,7 +495,7 @@ class ScrcpyPageState {
             client.stdout.pipeTo(new WritableStream({
                 write: (line) => {
                     this.log.push(line);
-                }
+                },
             }));
 
             client.close().then(() => this.stop());
diff --git a/libraries/adb-backend-direct-sockets/src/index.ts b/libraries/adb-backend-direct-sockets/src/index.ts
index bf8c91ea..d103a5c1 100644
--- a/libraries/adb-backend-direct-sockets/src/index.ts
+++ b/libraries/adb-backend-direct-sockets/src/index.ts
@@ -60,7 +60,7 @@ export class AdbDirectSocketsBackendStreams implements ReadableWritablePair<Arra
         this.socket = socket;
 
         // Although Direct Sockets spec didn't say,
-        // WebTransport spec and File spec all have the `Uint8Array` wraps the while `ArrayBuffer`.
+        // WebTransport spec and File spec all have the `Uint8Array` wraps the whole `ArrayBuffer`.
         this._readableTransformStream = new ExtractViewBufferStream();
         this.socket.readable.pipeTo(this._readableTransformStream.writable);
     }
diff --git a/libraries/adb/src/socket/dispatcher.ts b/libraries/adb/src/socket/dispatcher.ts
index c32807f0..386d73dd 100644
--- a/libraries/adb/src/socket/dispatcher.ts
+++ b/libraries/adb/src/socket/dispatcher.ts
@@ -205,7 +205,7 @@ export class AdbPacketDispatcher extends AutoDisposable {
             localCreated: true,
             serviceString,
         });
-        this.sockets.set(controller.localId, controller);
+        this.sockets.set(localId, controller);
 
         return new AdbSocket(controller);
     }