Fixes on Drivers and categories