Fix XPath expressions

Change-Id: I5980ba6b77f8adfe9a57fd2cffd8034e26bb086d