a few boostrap tweaks

Change-Id: I33e4ddebd3618ad78f11f1d328b6fb85edbb99c0