additional indexing fixes