Bug fixes in the driver framework