Solver: Misc tweaks