fix up some more bootstrap stuff