fix a few driver bugs