Normalize driver code
Need our patched sift
1.0.4