Fix bootstrap helper