various bootstrap fixes