Compatibility modifications for native driver