Couple of fixes, including clamping estimated branch factor to 1.