Tweaks to base and simple solvers

Hope this is right.
Will try to merge with our liquid phase branch next...