More prep

Change-Id: I64fcf3f3db4c574f40f5170153988ee3f7b0c10b