Tweaks to address acceptance logic on driver.