Further fixes to config driver usage.

Change-Id: Ie598d14077d35b9fcfbc1289f0f0b9110541fa55