Minor changes to the bootstrapper following inital testing.
Minor changes to the bootstrapper following inital testing.