Some small configs back in overlay

Change-Id: I45688d403713f77c312be50ae652ea49dc52e49a