more config work

Change-Id: I653e0b2ebdcb0bfa613dd3f190f2ff01c880bf76