last round of bootstrap fixes