Fixed up the bootstrapping process.