More drive fixes