Avoid a compilation warning
Minor improvements to bootstrapping code