Removed several warnings issued by IntelliJ.
Fixed error that indexer does not work correctly.