Driver - Optimized

Minor fixes
Driver - Optimized