Main index related fixes.