Some index related basic changes