A couple of tweaks to the driver for bug #7410.