Tweaks for custom index usage