Fix bootstrap scripts