Fixed a lot of compilation bugs in Solver.*