Started testing on the indexer, found some issues