--- /n/sources/plan9/sys/src/cmd/6l/compat.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/6l/compat.c	Sun Jun 28 00:00:00 2026
@@ -4,7 +4,7 @@
  * fake malloc
  */
 void*
-malloc(ulong n)
+malloc(uintptr n)
 {
 	void *p;
 
@@ -25,7 +25,7 @@ free(void *p)
 }
 
 void*
-calloc(ulong m, ulong n)
+calloc(uintptr m, uintptr n)
 {
 	void *p;
 
@@ -36,7 +36,7 @@ calloc(ulong m, ulong n)
 }
 
 void*
-realloc(void*, ulong)
+realloc(void*, uintptr)
 {
 	fprint(2, "realloc called\n");
 	abort();
@@ -50,10 +50,8 @@ mysbrk(ulong size)
 }
 
 void
-setmalloctag(void *v, ulong pc)
+setmalloctag(void*, uintptr)
 {
-	USED(v);
-	USED(pc);
 }
 
 int
--- /n/sources/plan9/sys/src/cmd/8l/compat.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/8l/compat.c	Sun Jun 28 00:00:00 2026
@@ -4,7 +4,7 @@
  * fake malloc
  */
 void*
-malloc(ulong n)
+malloc(uintptr n)
 {
 	void *p;
 
@@ -25,7 +25,7 @@ free(void *p)
 }
 
 void*
-calloc(ulong m, ulong n)
+calloc(uintptr m, uintptr n)
 {
 	void *p;
 
@@ -36,7 +36,7 @@ calloc(ulong m, ulong n)
 }
 
 void*
-realloc(void*, ulong)
+realloc(void*, uintptr)
 {
 	fprint(2, "realloc called\n");
 	abort();
@@ -50,9 +50,8 @@ mysbrk(ulong size)
 }
 
 void
-setmalloctag(void *v, ulong pc)
+setmalloctag(void*, uintptr)
 {
-	USED(v, pc);
 }
 
 int
--- /n/sources/plan9/sys/src/cmd/9l/compat.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/9l/compat.c	Sun Jun 28 00:00:00 2026
@@ -4,7 +4,7 @@
  * fake malloc
  */
 void*
-malloc(ulong n)
+malloc(uintptr n)
 {
 	void *p;
 
@@ -25,7 +25,7 @@ free(void *p)
 }
 
 void*
-calloc(ulong m, ulong n)
+calloc(uintptr m, uintptr n)
 {
 	void *p;
 
@@ -36,7 +36,7 @@ calloc(ulong m, ulong n)
 }
 
 void*
-realloc(void*, ulong)
+realloc(void*, uintptr)
 {
 	fprint(2, "realloc called\n");
 	abort();
@@ -50,9 +50,8 @@ mysbrk(ulong size)
 }
 
 void
-setmalloctag(void *v, ulong pc)
+setmalloctag(void*, uintptr)
 {
-	USED(v, pc);
 }
 
 int
--- /n/sources/plan9/sys/src/cmd/ld/falloc.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/ld/falloc.c	Sun Jun 28 00:00:00 2026
@@ -4,7 +4,7 @@
  * fake malloc
  */
 void*
-malloc(usize n)
+malloc(uintptr n)
 {
 	return halloc(n);
 }
@@ -16,7 +16,7 @@ free(void *p)
 }
 
 void*
-calloc(usize m, usize n)
+calloc(uintptr m, uintptr n)
 {
 	void *p;
 
@@ -30,7 +30,7 @@ calloc(usize m, usize n)
  * not used by compiler or loader, but Windows needs it
  */
 void*
-realloc(void *p, usize n)
+realloc(void *p, uintptr n)
 {
 	void *new;
 
@@ -41,7 +41,7 @@ realloc(void *p, usize n)
 }
 
 void
-setmalloctag(void *v, ulong pc)
+setmalloctag(void *v, uintptr pc)
 {
 	USED(v);
 	USED(pc);
--- /n/sources/plan9/sys/src/cmd/page/page.h	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/page/page.h	Sun Jun 28 00:00:00 2026
@@ -12,8 +12,8 @@ struct Document {
 	void *extra;
 };
 
-void *emalloc(int);
-void *erealloc(void*, int);
+void *emalloc(uintptr);
+void *erealloc(void*, uintptr);
 char *estrdup(char*);
 int spawncmd(char*, char **, int, int, int);
 
--- /n/sources/plan9/sys/src/cmd/page/util.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/page/util.c	Sun Jun 28 00:00:00 2026
@@ -6,12 +6,13 @@
 #include "page.h"
 
 void*
-emalloc(int sz)
+emalloc(uintptr sz)
 {
 	void *v;
+
 	v = malloc(sz);
 	if(v == nil) {
-		fprint(2, "out of memory allocating %d\n", sz);
+		fprint(2, "out of memory allocating %lld\n", (uvlong)sz);
 		wexits("mem");
 	}
 	memset(v, 0, sz);
@@ -19,11 +20,11 @@ emalloc(int sz)
 }
 
 void*
-erealloc(void *v, int sz)
+erealloc(void *v, uintptr sz)
 {
 	v = realloc(v, sz);
 	if(v == nil) {
-		fprint(2, "out of memory allocating %d\n", sz);
+		fprint(2, "out of memory allocating %lld\n", (uvlong)sz);
 		wexits("mem");
 	}
 	return v;
@@ -33,6 +34,7 @@ char*
 estrdup(char *s)
 {
 	char *t;
+
 	if((t = strdup(s)) == nil) {
 		fprint(2, "out of memory in strdup(%.10s)\n", s);
 		wexits("mem");
@@ -105,6 +107,7 @@ stdinpipe(uchar *ibuf, int in)
 	uchar buf[8192];
 	int n;
 	int p[2];
+
 	if(pipe(p) < 0){
 		fprint(2, "pipe fails: %r\n");	
 		wexits("pipe");
--- /n/sources/plan9/sys/src/cmd/ql/compat.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/ql/compat.c	Sun Jun 28 00:00:00 2026
@@ -4,7 +4,7 @@
  * fake malloc
  */
 void*
-malloc(ulong n)
+malloc(uintptr n)
 {
 	void *p;
 
@@ -25,7 +25,7 @@ free(void *p)
 }
 
 void*
-calloc(ulong m, ulong n)
+calloc(uintptr m, uintptr n)
 {
 	void *p;
 
@@ -36,7 +36,7 @@ calloc(ulong m, ulong n)
 }
 
 void*
-realloc(void*, ulong)
+realloc(void*, uintptr)
 {
 	fprint(2, "realloc called\n");
 	abort();
@@ -50,9 +50,8 @@ mysbrk(ulong size)
 }
 
 void
-setmalloctag(void *v, ulong pc)
+setmalloctag(void*, uintptr)
 {
-	USED(v, pc);
 }
 
 int
--- /n/sources/plan9/sys/src/cmd/ratrace.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/ratrace.c	Sun Jun 28 00:00:00 2026
@@ -4,7 +4,7 @@
 #include <thread.h>
 
 enum {
-	Stacksize	= 8*1024,
+	Stacksize	= 2048 * sizeof(uintptr),
 	Bufsize		= 8*1024,
 };
 
--- /n/sources/plan9/sys/src/cmd/upas/bayes/bayes.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/upas/bayes/bayes.c	Sun Jun 28 00:00:00 2026
@@ -45,7 +45,7 @@ usage(void)
 }
 
 void*
-emalloc(int n)
+emalloc(uintptr n)
 {
 	void *v;
 
--- /n/sources/plan9/sys/src/cmd/upas/filterkit/readaddrs.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/upas/filterkit/readaddrs.c	Sun Jun 28 00:00:00 2026
@@ -3,7 +3,7 @@
 #include "dat.h"
 
 void*
-emalloc(int size)
+emalloc(uintptr size)
 {
 	void *a;
 
--- /n/sources/plan9/sys/src/cmd/upas/marshal/marshal.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/upas/marshal/marshal.c	Sun Jun 28 00:00:00 2026
@@ -99,9 +99,9 @@ void	body(Biobuf*, Biobuf*, int);
 int	cistrcmp(char*, char*);
 int	cistrncmp(char*, char*, int);
 int	doublequote(Fmt*);
-void*	emalloc(int);
+void*	emalloc(uintptr);
 int	enc64(char*, int, uchar*, int);
-void*	erealloc(void*, int);
+void*	erealloc(void*, uintptr);
 char*	estrdup(char*);
 Addr*	expand(int, char**);
 Addr*	expandline(String**, Addr*);
@@ -816,7 +816,10 @@ printinreplyto(Biobuf *out, char *dir)
 	if(n <= 0)
 		return 0;
 	buf[n] = 0;
-	return Bprint(out, "In-Reply-To: %s\n", buf);
+	if (buf[0] == '<')
+		return Bprint(out, "In-Reply-To: %s\n", buf);
+	else
+		return Bprint(out, "In-Reply-To: <%s>\n", buf);
 }
 
 Attach*
@@ -1793,7 +1796,7 @@ estrdup(char *x)
 }
 
 void*
-emalloc(int n)
+emalloc(uintptr n)
 {
 	void *x;
 
@@ -1804,7 +1807,7 @@ emalloc(int n)
 }
 
 void*
-erealloc(void *x, int n)
+erealloc(void *x, uintptr n)
 {
 	x = realloc(x, n);
 	if(x == nil)
--- /n/sources/plan9/sys/src/cmd/vl/compat.c	Sat Jan 10 10:00:05 2015
+++ /sys/src/cmd/vl/compat.c	Sun Jun 28 00:00:00 2026
@@ -4,7 +4,7 @@
  * fake malloc
  */
 void*
-malloc(ulong n)
+malloc(uintptr n)
 {
 	void *p;
 
@@ -25,7 +25,7 @@ free(void *p)
 }
 
 void*
-calloc(ulong m, ulong n)
+calloc(uintptr m, uintptr n)
 {
 	void *p;
 
@@ -36,7 +36,7 @@ calloc(ulong m, ulong n)
 }
 
 void*
-realloc(void*, ulong)
+realloc(void*, uintptr)
 {
 	fprint(2, "realloc called\n");
 	abort();
@@ -50,9 +50,8 @@ mysbrk(ulong size)
 }
 
 void
-setmalloctag(void *v, ulong pc)
+setmalloctag(void*, uintptr)
 {
-	USED(v, pc);
 }
 
 int