Fix driver setup/teardown