diff --git a/ChangeLog b/ChangeLog
index 0758e2d0..6fb19df2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 22 11:57:49 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* xpath.c: patch from Richard Jinks to fix the problem raised in
+	  http://mail.gnome.org/archives/xml/2002-April/msg00246.htm
+
 Wed May 22 08:38:19 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* xmlschemas.c: a bit of work on import.
diff --git a/xmlschemas.c b/xmlschemas.c
index 15ff701f..bae2c7aa 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -2268,10 +2268,12 @@ xmlSchemaParseImport(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
 	    }
 	}
     }
-    TODO
 
     child = node->children;
     while (IS_SCHEMA(child, "annotation")) {
+	/*
+	 * the annotations here are simply discarded ...
+	 */
 	child = child->next;
     }
     if (child != NULL) {
diff --git a/xpath.c b/xpath.c
index 7f1f87a2..1c476b20 100644
--- a/xpath.c
+++ b/xpath.c
@@ -8100,6 +8100,7 @@ xmlXPathCompNodeTest(xmlXPathParserContextPtr ctxt, xmlXPathTestVal *test,
 	    if (CUR != ')') {
 		name = xmlXPathParseLiteral(ctxt);
 		CHECK_ERROR 0;
+		*type = NODE_TEST_PI;
 		SKIP_BLANKS;
 	    }
 	}