Couple more initial mods

Change-Id: I4095c27a2b86f55afebbe73fe09e28e0f3a92a4f