Fixed bootstrap problems.