Setup script mods

Change-Id: Idd876e21866c2a47e0355c2832b48eec6df060f6