Another small tweak for drivers