More changes for grace bootstrapper