Misc fixes.
Cleanup logging on driver_impl