fixes for xpath