Fix for Indexer API issues