Xpath fixes