XPath fixes