diff --git a/tools/examples/README b/tools/examples/README
index d17c7ef9a5..0fffb5e4b0 100644
--- a/tools/examples/README
+++ b/tools/examples/README
@@ -9,9 +9,20 @@ If you write a useful script and would like to share it, please do
 send it (preferably with a little summary to go in this file) to
 <xen-devel@lists.sourceforge.net> so we can add it to this directory.
 
+block-enbd          - binds/unbinds network block devices
+block-file          - binds/unbinds file to loopback device
+mem-map.sxp         - memory map xend configuration file.
 network             - default network setup script called by xend at startup.
+network-route       - default xen network start/stop script.
+network-nat         - default xen network start/stop script when using NAT.
 vif-bridge          - default virtual network interface setup script.
+vif-route           - default xen virtual network start/stop script
+vif-nat             - configures vif in routed-nat mode.
 xend-config.sxp     - default xend configuration file.
 xmexample1          - example configuration script for 'xm create'.
 xmexample2          - a more complex configuration script for 'xm create'.
+xmexample3          - an advanced configuration script for 'xm create' 
+                      that utilizes the vmid.
+xmexample.vmx       - a configuration script for creating a vmx domain with
+                      'xm create'.
 
diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 97d407ea55..6fa4bab307 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -665,8 +665,10 @@ def main(argv=sys.argv):
             err("Most commands need root access.  Please try again as root")
             sys.exit(1)
         except XendError, ex:
+            if args[0] == "bogus":
+                args.remove("bogus")
             if len(args) > 0:
-                handle_xend_error(argv[1], args[1], ex)
+                handle_xend_error(argv[1], args[0], ex)
             else:
                 print "Unexpected error:", sys.exc_info()[0]
                 print
diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 9692d6712d..3852bea9bc 100644
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -39,7 +39,7 @@ custom_param("amd_flush_filter", flush_filter);
  */
  
 extern void vide(void);
-__asm__(".align 4\nvide: ret");
+__asm__(".text\n.align 4\nvide: ret");
 
 static void __init init_amd(struct cpuinfo_x86 *c)
 {