Minor tweeks to index paths