More work on make for indexing calls