More bootstrap fixes.