Drivers: MANY FIXES TO LAST COMMITS...
Additional fixes...