Some minor updates on indexing in solver