Fixed bootstrap problems discovered on a fresh rebuild.