Some minor changes to the Solver class