Fixed bootstrap problems