diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 6db61985803f..40421a1a1b5b 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.90 1999/11/13 00:32:20 thorpej Exp $	 */
+/* $NetBSD: machdep.c,v 1.91 1999/12/11 17:51:34 ragge Exp $	 */
 
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -165,13 +165,10 @@ cpu_startup()
 
 	format_bytes(pbuf, sizeof(pbuf), avail_end);
 	printf("total memory = %s\n", pbuf);
-	physmem = btoc(avail_end);
 	panicstr = NULL;
 	mtpr(AST_NO, PR_ASTLVL);
 	spl0();
 
-	dumpsize = physmem + 1;
-
 	/*
 	 * Find out how much space we need, allocate it, and then give
 	 * everything true virtual addresses.
@@ -216,7 +213,7 @@ cpu_startup()
 		 * physical memory allocated for it.
 		 */
 		curbuf = (vm_offset_t) buffers + i * MAXBSIZE;
-		curbufsize = CLBYTES * (i < residual ? base + 1 : base);
+		curbufsize = NBPG * (i < residual ? base + 1 : base);
 		while (curbufsize) {
 			pg = uvm_pagealloc(NULL, 0, NULL, 0);
 			if (pg == NULL)
@@ -225,17 +222,18 @@ cpu_startup()
 			pmap_enter(kernel_map->pmap, curbuf,
 			    VM_PAGE_TO_PHYS(pg), VM_PROT_READ|VM_PROT_WRITE,
 			    VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
-			curbuf += CLBYTES;
-			curbufsize -= CLBYTES;
+			curbuf += NBPG;
+			curbufsize -= NBPG;
 		}
 	}
 
 	/*
 	 * Allocate a submap for exec arguments.  This map effectively limits
 	 * the number of processes exec'ing at any time.
+	 * At most one process with the full length is allowed.
 	 */
 	exec_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
-				 16 * NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
+				 NCARGS, VM_MAP_PAGEABLE, FALSE, NULL);
 
 	/*
 	 * Initialize callouts
@@ -248,7 +246,7 @@ cpu_startup()
 
 	format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
 	printf("avail memory = %s\n", pbuf);
-	format_bytes(pbuf, sizeof(pbuf), bufpages * CLBYTES);
+	format_bytes(pbuf, sizeof(pbuf), bufpages * NBPG);
 	printf("using %d buffers containing %s of memory\n", nbuf, pbuf);
 
 	/*
@@ -278,11 +276,11 @@ cpu_dumpconf()
 			dumplo = nblks - btodb(ctob(dumpsize));
 	}
 	/*
-	 * Don't dump on the first CLBYTES (why CLBYTES?) in case the dump
+	 * Don't dump on the first NBPG (why NBPG?) in case the dump
 	 * device includes a disk label.
 	 */
-	if (dumplo < btodb(CLBYTES))
-		dumplo = btodb(CLBYTES);
+	if (dumplo < btodb(NBPG))
+		dumplo = btodb(NBPG);
 }
 
 int
@@ -636,7 +634,8 @@ process_write_regs(p, regs)
 	tf->fp = regs->fp;
 	tf->sp = regs->sp;
 	tf->pc = regs->pc;
-	tf->psl = regs->psl;
+	tf->psl = (regs->psl|PSL_U|PSL_PREVU) &
+	    ~(PSL_MBZ|PSL_IS|PSL_IPL1F|PSL_CM); /* Allow compat mode? */
 	return 0;
 }
 
diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c
index 536f0929dd4f..98290541ab6a 100644
--- a/sys/arch/vax/vax/pmap.c
+++ b/sys/arch/vax/vax/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.74 1999/11/13 21:32:25 matt Exp $	   */
+/*	$NetBSD: pmap.c,v 1.75 1999/12/11 17:51:35 ragge Exp $	   */
 /*
  * Copyright (c) 1994, 1998, 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -146,6 +146,7 @@ pmap_bootstrap()
 	 * size calculations must be done now.
 	 * Remember: sysptsize is in PTEs and nothing else!
 	 */
+	physmem = btoc(avail_end);
 
 #define USRPTSIZE ((MAXTSIZ + MAXDSIZ + MAXSSIZ + MMAPSPACE) / VAX_NBPG)
 	/* Kernel alloc area */