Fix/bootstrap errors