Fix runoffByTwoCascadeSFM and Tweak