some bootstrap fixes