Minor improvement to driver handling. Refit to framework updates.