Driver fixes