Fix index creation/removal issues.