Indexing fixes

This is an update in preparation of reindexing. Shouldn't affect the rest of the stack, but pull requesting for visibility.