additional fixes to driver manipulation in suite mode