Fixed up the bootstrap procedure.
merge