Fixing bugs in progress for Solver