Fixed index_list, index_file discrepancies...