Fix a few drivers from last merge - these drivers were mostly backports from higher versions.