Tweaks to cluster and engine index methods