more setup script tweaks

Change-Id: I81c17c62e706a30a0212eb12f23a02c2f146aede