Reduce random data count.  Fix bootstrap stuff.