Fix up bootstrap