xpath tweaks