A few tweaks for root finder