fixed some redefinitions in the drivers