and a few more bootstrap fixes