diff --git a/arch/sparc32/entry.S b/arch/sparc32/entry.S
index af8d150..e51829a 100644
--- a/arch/sparc32/entry.S
+++ b/arch/sparc32/entry.S
@@ -245,6 +245,8 @@ first_cpu:
 
         set     AC_M_CTPR, %g2
         sta     %g7, [%g2] ASI_M_MMUREGS	! set ctx table ptr
+        set     AC_M_CXR, %g2
+        sta     %g0, [%g2] ASI_M_MMUREGS	! context 0
         set	1, %g1
         sta     %g1, [%g0] ASI_M_MMUREGS	! enable mmu
 
diff --git a/drivers/obio.c b/drivers/obio.c
index 78eb03c..29fb3e2 100644
--- a/drivers/obio.c
+++ b/drivers/obio.c
@@ -504,6 +504,9 @@ ob_nvram_init(unsigned long base, unsigned long offset)
     obio_cmdline[size] = '\0';
     cmdline = obio_cmdline;
     cmdline_size = size;
+    ((struct qemu_nvram_v1 *)nvram)->kernel_image = 0;
+    ((struct qemu_nvram_v1 *)nvram)->kernel_size = 0;
+    ((struct qemu_nvram_v1 *)nvram)->cmdline_size = 0;
 
     boot_device = nv_info.boot_device;
     nographic = nv_info.nographic;