Fixes to drivers

Change-Id: I3a437a05861e5bbad94eaf8da44b7b3a58e159c0
Merge "Fixes to drivers"