Fix solvers