NM: Fixing up xpath