More config tweaks

Change-Id: I6fe2b40ce03e564e3a389a04a4a9036e74321a45