Fixes bootstrap errors