Fixes for indexed_xpath_return