Minor changes in the index related files