Feature #1726: Minor modifications to the driver