bootstrap fixes