Fixing remaining bootstrapping issues, or mainly sidestepping them.