diff --git a/navi/tools/filesystem.py b/navi/tools/filesystem.py
index 99d7668..e915a28 100644
--- a/navi/tools/filesystem.py
+++ b/navi/tools/filesystem.py
@@ -768,8 +768,8 @@
             return ToolResult(success=False, output=f"Read error: {e}", error=str(e))
 
         diff = list(difflib.unified_diff(
-            [l + "\n" for l in a_lines],
-            [l + "\n" for l in b_lines],
+            a_lines,
+            b_lines,
             fromfile=f"a/{path.name}",
             tofile=f"b/{dest.name}",
             lineterm="",
diff --git a/navi/tools/scratchpad.py b/navi/tools/scratchpad.py
index 8b1f02b..0741ee1 100644
--- a/navi/tools/scratchpad.py
+++ b/navi/tools/scratchpad.py
@@ -26,7 +26,7 @@
     if _kv_store is None:
         return ""
     try:
-        val = await _kv_store.get(None, session_id, "scratchpad", section)
+        val = await _kv_store.get(_uid(), session_id, "scratchpad", section)
         return val or ""
     except Exception:
         return ""