Fix minor bugs
Merge https://github.com/loucas971/SOLVER