Tweaks for solver