diff --git a/mach/xenix3/libsys/head_em.s b/mach/xenix3/libsys/head_em.s
index bc2cd918e..2949f0594 100644
--- a/mach/xenix3/libsys/head_em.s
+++ b/mach/xenix3/libsys/head_em.s
@@ -48,7 +48,14 @@ begtext:
 	shr bx,cl
 	shl bx,cl
 	call grow
+	xor	cx,cx
+	push	cx
+	call	_sbrk
+	mov	(.limhp),ax
+	mov	(.reghp),ax	! on Xenix, heap begins above stack!
+	pop	ax
 	call    _m_a_i_n
+	push	ax
 	call	__exit
 .sect	.data
 begdata:
diff --git a/mach/xenix3/libsys/wait.c b/mach/xenix3/libsys/wait.c
index fb2c181f4..0a76175da 100644
--- a/mach/xenix3/libsys/wait.c
+++ b/mach/xenix3/libsys/wait.c
@@ -6,6 +6,6 @@ wait(p)
 	long l = _wait();
 
 	if (l == -1) return -1;
-	if (*p) *p = (l >> 16);
+	if (p) *p = (l >> 16);
 	return (int) l;
 }