fixes for consistency and setup -> native driver passthrough