diff --git a/linux-2.6.7-xen-sparse/drivers/xen/console/console.c b/linux-2.6.7-xen-sparse/drivers/xen/console/console.c
index ff76bab3c6..bea0a44e67 100644
--- a/linux-2.6.7-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6.7-xen-sparse/drivers/xen/console/console.c
@@ -535,7 +535,7 @@ static int xencons_open(struct tty_struct *tty, struct file *filp)
     unsigned long flags;
 
     if ( TTY_INDEX(tty) != 0 )
-        return -ENODEV;
+        return 0;
 
     MOD_INC_USE_COUNT;
 
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 5b6677b197..8e28ed849a 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -136,7 +136,7 @@ def make_disk(dom, uname, dev, mode, recreate=0):
     """
     segments = lookup_disk_uname(uname)
     if not segments:
-        raise VmError("vbd: Segments not foundXXXXXX: uname=%s" % uname)
+        raise VmError("vbd: Segments not found: uname=%s" % uname)
     if len(segments) > 1:
         raise VmError("vbd: Multi-segment vdisk: uname=%s" % uname)
     segment = segments[0]