Indexing fixes.