Crazy Driver Fixes