Few upgrades to driver copying.