Config file fixes

Change-Id: I76380c00e82daac13163909f5b142c175ec095be