small changes in DriverHelper