Fixed some holes in the bootstrapping system.