Some changes in solve_opt.cpp