Various bootstrap improvements.