Bug fixes to the bootstrapping.