Address -Wreorder warning in Driver.cpp