Random fixes
more driver fixes
More random changes