Minor tweaks to index