misc Drivers fixup