Fixed bootstrap errors