Follow up to I3ae653ac2777e19843182b420d33cd8f3420fa29

Fix selector so copyvio doesn't fail on 2nd run. Also run make less.

Change-Id: I91141aeff34bc225141fec145a683f26648c492f