fixes to drivers