more bootstrap fixes