Config tweaks

Change-Id: Ie9bf3ad51bfb94e1536d0640c3d162c3c4cde611