Fix bootstrap errors