Solver bug fixes