Fixed a few bugs that were related to the Indexer bug