Some fixes for the indexer