Minor fixes in Indexer.java to reduce errors