Various fixes to get the indexer to work again