final bootstrap fixes