More driver.hs updates