Minor output changes to driver.