Fix paths in driver
2 is no longer a valid value
Normalize driver code