Fix Solver <-> MatrixSolver relations.