Fixed driver options bugs