More indexing fixes