Minor fixes
Next try at XPath detection.