Fix obvious initial problem with drive support