More driver fixes
blafooo