Fix more bootstrap errors