Tweaks to index