Fix index management