Fix to use alternate drivers with 1.0.5, and fix USE_LAYOUT bug.