xpath: Minor modifications