Fix reindexer, and abstract rake runner