Fix indexer issues