indexing fixes